diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2019-03-22 16:19:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-22 16:19:48 +0100 |
| commit | fc3480d5b44d893f3973c1044b169be8cce32dbf (patch) | |
| tree | 275dc4bc634c91cc3750e79c9ab433cdb7697826 | |
| parent | 0d9b4d43971441641ffe29ad0cdf7e5f488a176b (diff) | |
| parent | 8bba3e58557535d2180e51066bdba59813c6b6cb (diff) | |
Merge pull request #8884 from vespa-engine/bjorncs/logserver-rpc
Bjorncs/logserver rpc
| -rw-r--r-- | logserver/pom.xml | 57 |
1 files changed, 41 insertions, 16 deletions
diff --git a/logserver/pom.xml b/logserver/pom.xml index 1045b93185e..a813558580c 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -14,11 +14,7 @@ <name>logserver</name> <description>Log server.</description> <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> + <!-- compile scope --> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> @@ -34,6 +30,22 @@ <artifactId>vespalog</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>jrt</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </dependency> + + <!-- test scope --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> @@ -44,29 +56,38 @@ <compilerArgs> <arg>-Xlint:all</arg> <arg>-Xlint:-serial</arg> + <arg>-Xlint:-cast</arg> <arg>-Werror</arg> </compilerArgs> </configuration> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> <configuration> - <archive> - <manifest> + <finalName>${project.artifactId}-jar-with-dependencies</finalName> + <filters> + <filter> + <!-- Don't include signature files from bouncycastle in uber jar. --> + <artifact>*:*</artifact> + <excludes> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> + </excludes> + </filter> + </filters> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <mainClass>com.yahoo.logserver.Server</mainClass> - </manifest> - </archive> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + </transformer> + </transformers> </configuration> <executions> <execution> - <id>make-assembly</id> <phase>package</phase> - <!-- append to the packaging phase. --> <goals> - <goal>single</goal> + <goal>shade</goal> </goals> </execution> </executions> @@ -78,6 +99,10 @@ <updateReleaseInfo>true</updateReleaseInfo> </configuration> </plugin> + <plugin> + <groupId>com.github.os72</groupId> + <artifactId>protoc-jar-maven-plugin</artifactId> + </plugin> </plugins> </build> </project> |