Skip to content

Commit

Permalink
FAB-5315 Remove unneeded runtime jars update to latest.
Browse files Browse the repository at this point in the history
Remove unneeded runtime jars and update to latest.

PS 2: remove protos and test properties from jar
PS 5 update grpc to 1.5 commons compress 1.14

Change-Id: I0dbb2083ca5c3b1a3db07348c19b2cd3afd148ff
Signed-off-by: rickr <cr22rc@gmail.com>
  • Loading branch information
cr22rc committed Jul 20, 2017
1 parent 8d12ffb commit 83b117c
Showing 1 changed file with 23 additions and 31 deletions.
54 changes: 23 additions & 31 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<tag>fabric-sdk-java-1.0</tag>
</scm>
<properties>
<grpc.version>1.3.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
<bouncycastle.version>1.55</bouncycastle.version>
<httpclient.version>4.5.2</httpclient.version>
<grpc.version>1.5.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
<bouncycastle.version>1.57</bouncycastle.version>
<httpclient.version>4.5.3</httpclient.version>
<skipITs>true</skipITs>
<alpn-boot-version>8.1.7.v20160121</alpn-boot-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -51,6 +51,7 @@
</reportSet>
</reportSets>
</plugin>
<!-- https://mvnrepository.com/artifact/org.jacoco/jacoco-maven-plugin -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down Expand Up @@ -84,18 +85,18 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>1.1.33.Fork26</version>
<version>2.0.5.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>4.1.8.Final</version>
<version>4.1.13.Final</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.1.0</version>
<version>3.3.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on -->
<dependency>
Expand All @@ -112,38 +113,33 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.3.1</version>
<version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.12</version>
<version>1.14</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<version>2.5</version>
</dependency>

<!-- https://mvnrepository.com/artifact/log4j/log4j -->
<!---
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.6.2</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.6.2</version>
</dependency>
-->
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>

<!--<dependency>-->
<!--<groupId>org.apache.logging.log4j</groupId>-->
<!--<artifactId>log4j-core</artifactId>-->
<!--<version>2.8.2</version>-->
<!--</dependency>-->


<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -155,7 +151,7 @@
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.0.4</version>
<version>1.1</version>
</dependency>

<!--&lt;!&ndash; https://mvnrepository.com/artifact/org.mortbay.jetty.alpn/jetty-alpn-agent &ndash;&gt;-->
Expand All @@ -180,13 +176,6 @@
<version>1.18</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.jacoco/jacoco-maven-plugin -->
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
</dependency>

</dependencies>


Expand All @@ -197,8 +186,10 @@
<directory>src</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.Docker</include>
</includes>
<excludes>
<exclude>test/**</exclude>
</excludes>
</resource>
</resources>
<extensions>
Expand Down Expand Up @@ -260,6 +251,7 @@
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
</pluginArtifact>
<attachProtoSources>false</attachProtoSources>
</configuration>
<executions>
<execution>
Expand Down

0 comments on commit 83b117c

Please sign in to comment.