Skip to content
This repository was archived by the owner on Apr 22, 2025. It is now read-only.

Commit 83b117c

Browse files
committed
FAB-5315 Remove unneeded runtime jars update to latest.
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>
1 parent 8d12ffb commit 83b117c

File tree

1 file changed

+23
-31
lines changed

1 file changed

+23
-31
lines changed

pom.xml

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
<tag>fabric-sdk-java-1.0</tag>
2929
</scm>
3030
<properties>
31-
<grpc.version>1.3.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
32-
<bouncycastle.version>1.55</bouncycastle.version>
33-
<httpclient.version>4.5.2</httpclient.version>
31+
<grpc.version>1.5.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
32+
<bouncycastle.version>1.57</bouncycastle.version>
33+
<httpclient.version>4.5.3</httpclient.version>
3434
<skipITs>true</skipITs>
3535
<alpn-boot-version>8.1.7.v20160121</alpn-boot-version>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -51,6 +51,7 @@
5151
</reportSet>
5252
</reportSets>
5353
</plugin>
54+
<!-- https://mvnrepository.com/artifact/org.jacoco/jacoco-maven-plugin -->
5455
<plugin>
5556
<groupId>org.jacoco</groupId>
5657
<artifactId>jacoco-maven-plugin</artifactId>
@@ -84,18 +85,18 @@
8485
<dependency>
8586
<groupId>io.netty</groupId>
8687
<artifactId>netty-tcnative-boringssl-static</artifactId>
87-
<version>1.1.33.Fork26</version>
88+
<version>2.0.5.Final</version>
8889
</dependency>
8990
<dependency>
9091
<groupId>io.netty</groupId>
9192
<artifactId>netty-codec-http2</artifactId>
92-
<version>4.1.8.Final</version>
93+
<version>4.1.13.Final</version>
9394
</dependency>
9495
<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
9596
<dependency>
9697
<groupId>com.google.protobuf</groupId>
9798
<artifactId>protobuf-java</artifactId>
98-
<version>3.1.0</version>
99+
<version>3.3.1</version>
99100
</dependency>
100101
<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on -->
101102
<dependency>
@@ -112,38 +113,33 @@
112113
<dependency>
113114
<groupId>commons-cli</groupId>
114115
<artifactId>commons-cli</artifactId>
115-
<version>1.3.1</version>
116+
<version>1.4</version>
116117
</dependency>
117118
<dependency>
118119
<groupId>org.apache.commons</groupId>
119120
<artifactId>commons-compress</artifactId>
120-
<version>1.12</version>
121+
<version>1.14</version>
121122
</dependency>
122123
<dependency>
123124
<groupId>commons-io</groupId>
124125
<artifactId>commons-io</artifactId>
125-
<version>2.4</version>
126+
<version>2.5</version>
126127
</dependency>
127128

128-
<!-- https://mvnrepository.com/artifact/log4j/log4j -->
129-
<!---
130-
<dependency>
131-
<groupId>org.apache.logging.log4j</groupId>
132-
<artifactId>log4j-api</artifactId>
133-
<version>2.6.2</version>
134-
</dependency>
135-
<dependency>
136-
<groupId>org.apache.logging.log4j</groupId>
137-
<artifactId>log4j-core</artifactId>
138-
<version>2.6.2</version>
139-
</dependency>
140-
-->
129+
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
141130
<dependency>
142131
<groupId>log4j</groupId>
143132
<artifactId>log4j</artifactId>
144133
<version>1.2.17</version>
145134
</dependency>
146135

136+
<!--<dependency>-->
137+
<!--<groupId>org.apache.logging.log4j</groupId>-->
138+
<!--<artifactId>log4j-core</artifactId>-->
139+
<!--<version>2.8.2</version>-->
140+
<!--</dependency>-->
141+
142+
147143
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
148144
<dependency>
149145
<groupId>org.apache.httpcomponents</groupId>
@@ -155,7 +151,7 @@
155151
<dependency>
156152
<groupId>org.glassfish</groupId>
157153
<artifactId>javax.json</artifactId>
158-
<version>1.0.4</version>
154+
<version>1.1</version>
159155
</dependency>
160156

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

183-
<!-- https://mvnrepository.com/artifact/org.jacoco/jacoco-maven-plugin -->
184-
<dependency>
185-
<groupId>org.jacoco</groupId>
186-
<artifactId>jacoco-maven-plugin</artifactId>
187-
<version>${jacoco.version}</version>
188-
</dependency>
189-
190179
</dependencies>
191180

192181

@@ -197,8 +186,10 @@
197186
<directory>src</directory>
198187
<includes>
199188
<include>**/*.properties</include>
200-
<include>**/*.Docker</include>
201189
</includes>
190+
<excludes>
191+
<exclude>test/**</exclude>
192+
</excludes>
202193
</resource>
203194
</resources>
204195
<extensions>
@@ -260,6 +251,7 @@
260251
<pluginId>grpc-java</pluginId>
261252
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
262253
</pluginArtifact>
254+
<attachProtoSources>false</attachProtoSources>
263255
</configuration>
264256
<executions>
265257
<execution>

0 commit comments

Comments
 (0)