简柏林 / thingskit · Commits

Commit d5c20851cf6238381f078b44d7bc7d54c0f5bdfe

Authored by Igor Kulikov
Committed by GitHub
2 parents 05c2919f 7b6e8248

Merge pull request #5128 from smatvienko-tb/dependency-management-transitive-ce-3-3-1 

[3.3.1] Dependency management (TRANSITIVE) CE 3.3.1
Inline Side-by-side
Showing 8 changed files with 168 additions and 61 deletions
... ... @@ -230,8 +230,16 @@
230 230 <artifactId>protobuf-java</artifactId>
231 231 </dependency>
232 232 <dependency>
  233 + <groupId>io.netty</groupId>
  234 + <artifactId>netty-all</artifactId>
  235 + </dependency>
  236 + <dependency>
  237 + <groupId>io.netty</groupId>
  238 + <artifactId>netty-tcnative-boringssl-static</artifactId>
  239 + </dependency>
  240 + <dependency>
233 241 <groupId>io.grpc</groupId>
234   - <artifactId>grpc-netty</artifactId>
  242 + <artifactId>grpc-netty-shaded</artifactId>
235 243 </dependency>
236 244 <dependency>
237 245 <groupId>io.grpc</groupId>
... ...
... ... @@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
19 19 import com.google.common.util.concurrent.FutureCallback;
20 20 import com.google.common.util.concurrent.Futures;
21 21 import io.grpc.Server;
22   -import io.grpc.netty.NettyServerBuilder;
  22 +import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
23 23 import io.grpc.stub.StreamObserver;
24 24 import lombok.extern.slf4j.Slf4j;
25 25 import org.springframework.beans.factory.annotation.Autowired;
... ...
... ... @@ -82,22 +82,17 @@
82 82 <scope>provided</scope>
83 83 </dependency>
84 84 <dependency>
  85 + <groupId>io.netty</groupId>
  86 + <artifactId>netty-tcnative-boringssl-static</artifactId>
  87 + <scope>provided</scope>
  88 + </dependency>
  89 + <dependency>
85 90 <groupId>com.google.guava</groupId>
86 91 <artifactId>guava</artifactId>
87 92 </dependency>
88 93 <dependency>
89 94 <groupId>io.grpc</groupId>
90   - <artifactId>grpc-netty</artifactId>
91   - <exclusions>
92   - <exclusion>
93   - <artifactId>netty-transport</artifactId>
94   - <groupId>io.netty</groupId>
95   - </exclusion>
96   - <exclusion>
97   - <artifactId>netty-common</artifactId>
98   - <groupId>io.netty</groupId>
99   - </exclusion>
100   - </exclusions>
  95 + <artifactId>grpc-netty-shaded</artifactId>
101 96 </dependency>
102 97 <dependency>
103 98 <groupId>io.grpc</groupId>
... ...
... ... @@ -16,8 +16,8 @@
16 16 package org.thingsboard.edge.rpc;
17 17
18 18 import io.grpc.ManagedChannel;
19   -import io.grpc.netty.GrpcSslContexts;
20   -import io.grpc.netty.NettyChannelBuilder;
  19 +import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
  20 +import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
21 21 import io.grpc.stub.StreamObserver;
22 22 import io.netty.handler.ssl.SslContextBuilder;
23 23 import lombok.extern.slf4j.Slf4j;
... ...
... ... @@ -45,6 +45,10 @@
45 45 <artifactId>netty-all</artifactId>
46 46 </dependency>
47 47 <dependency>
  48 + <groupId>io.netty</groupId>
  49 + <artifactId>netty-tcnative-boringssl-static</artifactId>
  50 + </dependency>
  51 + <dependency>
48 52 <groupId>org.springframework</groupId>
49 53 <artifactId>spring-context-support</artifactId>
50 54 </dependency>
... ...
... ... @@ -56,11 +56,15 @@
56 56 <guava.version>28.2-jre</guava.version>
57 57 <caffeine.version>2.6.1</caffeine.version>
58 58 <commons-lang3.version>3.4</commons-lang3.version>
  59 + <commons-codec.version>1.15</commons-codec.version>
59 60 <commons-io.version>2.11.0</commons-io.version>
  61 + <commons-logging.version>1.2</commons-logging.version>
60 62 <commons-csv.version>1.4</commons-csv.version>
  63 + <apache-httpclient.version>4.5.13</apache-httpclient.version>
  64 + <apache-httpcore.version>4.4.14</apache-httpcore.version>
  65 + <joda-time.version>2.8.1</joda-time.version>
61 66 <jackson.version>2.12.1</jackson.version>
62   - <jackson-annotations.version>2.12.1</jackson-annotations.version>
63   - <jackson-core.version>2.12.1</jackson-core.version>
  67 + <fasterxml-classmate.version>1.3.4</fasterxml-classmate.version>
64 68 <json-schema-validator.version>2.2.6</json-schema-validator.version>
65 69 <californium.version>2.6.1</californium.version>
66 70 <leshan.version>2.0.0-M3</leshan.version>
... ... @@ -73,7 +77,8 @@
73 77 <grpc.version>1.38.0</grpc.version>
74 78 <lombok.version>1.18.18</lombok.version>
75 79 <paho.client.version>1.2.4</paho.client.version>
76   - <netty.version>4.1.66.Final</netty.version>
  80 + <netty.version>4.1.67.Final</netty.version>
  81 + <netty-tcnative-boringssl-static.version>2.0.40.Final</netty-tcnative-boringssl-static.version>
77 82 <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
78 83 <rabbitmq.version>4.8.0</rabbitmq.version>
79 84 <surfire.version>2.19.1</surfire.version>
... ... @@ -97,6 +102,7 @@
97 102 <snakeyaml.version>1.27</snakeyaml.version>
98 103 <aws.sdk.version>1.11.747</aws.sdk.version>
99 104 <pubsub.client.version>1.105.0</pubsub.client.version>
  105 + <google.common.protos.version>2.1.0</google.common.protos.version> <!-- required by io.grpc:grpc-protobuf:1.38.0-->
100 106 <azure-servicebus.version>3.2.0</azure-servicebus.version>
101 107 <passay.version>1.5.0</passay.version>
102 108 <ua-parser.version>1.4.3</ua-parser.version>
... ... @@ -647,7 +653,7 @@
647 653 <plugin>
648 654 <groupId>org.apache.maven.plugins</groupId>
649 655 <artifactId>maven-surefire-plugin</artifactId>
650   - <version>3.0.0-M1</version>
  656 + <version>3.0.0-M5</version>
651 657 <configuration>
652 658 <argLine>
653 659 --illegal-access=permit
... ... @@ -1061,23 +1067,11 @@
1061 1067 <groupId>org.springframework.security</groupId>
1062 1068 <artifactId>spring-security-oauth2-client</artifactId>
1063 1069 <version>${spring-security.version}</version>
1064   - <exclusions>
1065   - <exclusion>
1066   - <groupId>org.springframework</groupId>
1067   - <artifactId>spring-core</artifactId>
1068   - </exclusion>
1069   - </exclusions>
1070 1070 </dependency>
1071 1071 <dependency>
1072 1072 <groupId>org.springframework.security</groupId>
1073 1073 <artifactId>spring-security-oauth2-jose</artifactId>
1074 1074 <version>${spring-security.version}</version>
1075   - <exclusions>
1076   - <exclusion>
1077   - <groupId>org.springframework</groupId>
1078   - <artifactId>spring-core</artifactId>
1079   - </exclusion>
1080   - </exclusions>
1081 1075 </dependency>
1082 1076 <dependency>
1083 1077 <groupId>org.springframework</groupId>
... ... @@ -1229,7 +1223,27 @@
1229 1223 </dependency>
1230 1224 <dependency>
1231 1225 <groupId>io.netty</groupId>
1232   - <artifactId>netty-handler</artifactId>
  1226 + <artifactId>netty-tcnative-boringssl-static</artifactId>
  1227 + <version>${netty-tcnative-boringssl-static.version}</version>
  1228 + </dependency>
  1229 + <dependency>
  1230 + <groupId>io.netty</groupId>
  1231 + <artifactId>netty-buffer</artifactId>
  1232 + <version>${netty.version}</version>
  1233 + </dependency>
  1234 + <dependency>
  1235 + <groupId>io.netty</groupId>
  1236 + <artifactId>netty-codec</artifactId>
  1237 + <version>${netty.version}</version>
  1238 + </dependency>
  1239 + <dependency>
  1240 + <groupId>io.netty</groupId>
  1241 + <artifactId>netty-codec-http</artifactId>
  1242 + <version>${netty.version}</version>
  1243 + </dependency>
  1244 + <dependency>
  1245 + <groupId>io.netty</groupId>
  1246 + <artifactId>netty-codec-http2</artifactId>
1233 1247 <version>${netty.version}</version>
1234 1248 </dependency>
1235 1249 <dependency>
... ... @@ -1238,6 +1252,53 @@
1238 1252 <version>${netty.version}</version>
1239 1253 </dependency>
1240 1254 <dependency>
  1255 + <groupId>io.netty</groupId>
  1256 + <artifactId>netty-codec-socks</artifactId>
  1257 + <version>${netty.version}</version>
  1258 + </dependency>
  1259 + <dependency>
  1260 + <groupId>io.netty</groupId>
  1261 + <artifactId>netty-common</artifactId>
  1262 + <version>${netty.version}</version>
  1263 + </dependency>
  1264 + <dependency>
  1265 + <groupId>io.netty</groupId>
  1266 + <artifactId>netty-handler</artifactId>
  1267 + <version>${netty.version}</version>
  1268 + </dependency>
  1269 + <dependency>
  1270 + <groupId>io.netty</groupId>
  1271 + <artifactId>netty-handler-proxy</artifactId>
  1272 + <version>${netty.version}</version>
  1273 + </dependency>
  1274 + <dependency>
  1275 + <groupId>io.netty</groupId>
  1276 + <artifactId>netty-resolver</artifactId>
  1277 + <version>${netty.version}</version>
  1278 + </dependency>
  1279 + <dependency>
  1280 + <groupId>io.netty</groupId>
  1281 + <artifactId>netty-transport</artifactId>
  1282 + <version>${netty.version}</version>
  1283 + </dependency>
  1284 + <dependency> <!-- brought by com.microsoft.azure:azure-servicebus -->
  1285 + <groupId>io.netty</groupId>
  1286 + <artifactId>netty-transport-native-epoll</artifactId>
  1287 + <version>${netty.version}</version>
  1288 + <classifier>linux-x86_64</classifier>
  1289 + </dependency>
  1290 + <dependency> <!-- brought by com.microsoft.azure:azure-servicebus -->
  1291 + <groupId>io.netty</groupId>
  1292 + <artifactId>netty-transport-native-kqueue</artifactId>
  1293 + <version>${netty.version}</version>
  1294 + <classifier>osx-x86_64</classifier>
  1295 + </dependency>
  1296 + <dependency>
  1297 + <groupId>io.netty</groupId>
  1298 + <artifactId>netty-transport-native-unix-common</artifactId>
  1299 + <version>${netty.version}</version>
  1300 + </dependency>
  1301 + <dependency>
1241 1302 <groupId>com.datastax.oss</groupId>
1242 1303 <artifactId>java-driver-core</artifactId>
1243 1304 <version>${cassandra.version}</version>
... ... @@ -1268,11 +1329,36 @@
1268 1329 <version>${commons-io.version}</version>
1269 1330 </dependency>
1270 1331 <dependency>
  1332 + <groupId>commons-codec</groupId>
  1333 + <artifactId>commons-codec</artifactId>
  1334 + <version>${commons-codec.version}</version>
  1335 + </dependency>
  1336 + <dependency>
  1337 + <groupId>commons-logging</groupId>
  1338 + <artifactId>commons-logging</artifactId>
  1339 + <version>${commons-logging.version}</version>
  1340 + </dependency>
  1341 + <dependency>
1271 1342 <groupId>org.apache.commons</groupId>
1272 1343 <artifactId>commons-csv</artifactId>
1273 1344 <version>${commons-csv.version}</version>
1274 1345 </dependency>
1275 1346 <dependency>
  1347 + <groupId>org.apache.httpcomponents</groupId>
  1348 + <artifactId>httpclient</artifactId>
  1349 + <version>${apache-httpclient.version}</version>
  1350 + </dependency>
  1351 + <dependency>
  1352 + <groupId>org.apache.httpcomponents</groupId>
  1353 + <artifactId>httpcore</artifactId>
  1354 + <version>${apache-httpcore.version}</version>
  1355 + </dependency>
  1356 + <dependency>
  1357 + <groupId>joda-time</groupId>
  1358 + <artifactId>joda-time</artifactId>
  1359 + <version>${joda-time.version}</version>
  1360 + </dependency>
  1361 + <dependency>
1276 1362 <groupId>com.fasterxml.jackson.core</groupId>
1277 1363 <artifactId>jackson-databind</artifactId>
1278 1364 <version>${jackson.version}</version>
... ... @@ -1280,12 +1366,42 @@
1280 1366 <dependency>
1281 1367 <groupId>com.fasterxml.jackson.core</groupId>
1282 1368 <artifactId>jackson-core</artifactId>
1283   - <version>${jackson-core.version}</version>
  1369 + <version>${jackson.version}</version>
1284 1370 </dependency>
1285 1371 <dependency>
1286 1372 <groupId>com.fasterxml.jackson.core</groupId>
1287 1373 <artifactId>jackson-annotations</artifactId>
1288   - <version>${jackson-annotations.version}</version>
  1374 + <version>${jackson.version}</version>
  1375 + </dependency>
  1376 + <dependency>
  1377 + <groupId>com.fasterxml.jackson.dataformat</groupId>
  1378 + <artifactId>jackson-dataformat-cbor</artifactId>
  1379 + <version>${jackson.version}</version>
  1380 + </dependency>
  1381 + <dependency>
  1382 + <groupId>com.fasterxml.jackson.datatype</groupId>
  1383 + <artifactId>jackson-datatype-jdk8</artifactId>
  1384 + <version>${jackson.version}</version>
  1385 + </dependency>
  1386 + <dependency>
  1387 + <groupId>com.fasterxml.jackson.datatype</groupId>
  1388 + <artifactId>jackson-datatype-joda</artifactId>
  1389 + <version>${jackson.version}</version>
  1390 + </dependency>
  1391 + <dependency>
  1392 + <groupId>com.fasterxml.jackson.datatype</groupId>
  1393 + <artifactId>jackson-datatype-jsr310</artifactId>
  1394 + <version>${jackson.version}</version>
  1395 + </dependency>
  1396 + <dependency>
  1397 + <groupId>com.fasterxml.jackson.module</groupId>
  1398 + <artifactId>jackson-module-parameter-names</artifactId>
  1399 + <version>${jackson.version}</version>
  1400 + </dependency>
  1401 + <dependency>
  1402 + <groupId>com.fasterxml</groupId>
  1403 + <artifactId>classmate</artifactId>
  1404 + <version>${fasterxml-classmate.version}</version>
1289 1405 </dependency>
1290 1406 <dependency>
1291 1407 <groupId>com.github.fge</groupId>
... ... @@ -1394,14 +1510,8 @@
1394 1510 </dependency>
1395 1511 <dependency>
1396 1512 <groupId>io.grpc</groupId>
1397   - <artifactId>grpc-netty</artifactId>
  1513 + <artifactId>grpc-netty-shaded</artifactId>
1398 1514 <version>${grpc.version}</version>
1399   - <exclusions>
1400   - <exclusion>
1401   - <groupId>io.netty</groupId>
1402   - <artifactId>*</artifactId>
1403   - </exclusion>
1404   - </exclusions>
1405 1515 </dependency>
1406 1516 <dependency>
1407 1517 <groupId>io.grpc</groupId>
... ... @@ -1574,12 +1684,6 @@
1574 1684 <groupId>de.ruedigermoeller</groupId>
1575 1685 <artifactId>fst</artifactId>
1576 1686 <version>${fst.version}</version>
1577   - <exclusions>
1578   - <exclusion>
1579   - <groupId>com.fasterxml.jackson.core</groupId>
1580   - <artifactId>jackson-core</artifactId>
1581   - </exclusion>
1582   - </exclusions>
1583 1687 </dependency>
1584 1688 <dependency>
1585 1689 <groupId>io.springfox.ui</groupId>
... ... @@ -1612,15 +1716,14 @@
1612 1716 <version>${pubsub.client.version}</version>
1613 1717 </dependency>
1614 1718 <dependency>
  1719 + <groupId>com.google.api.grpc</groupId>
  1720 + <artifactId>proto-google-common-protos</artifactId>
  1721 + <version>${google.common.protos.version}</version>
  1722 + </dependency>
  1723 + <dependency>
1615 1724 <groupId>com.microsoft.azure</groupId>
1616 1725 <artifactId>azure-servicebus</artifactId>
1617 1726 <version>${azure-servicebus.version}</version>
1618   - <exclusions>
1619   - <exclusion>
1620   - <groupId>io.netty</groupId>
1621   - <artifactId>*</artifactId>
1622   - </exclusion>
1623   - </exclusions>
1624 1727 </dependency>
1625 1728 <dependency>
1626 1729 <groupId>org.passay</groupId>
... ... @@ -1720,10 +1823,6 @@
1720 1823 <groupId>com.github.spotbugs</groupId>
1721 1824 <artifactId>spotbugs-annotations</artifactId>
1722 1825 </exclusion>
1723   - <exclusion>
1724   - <groupId>commons-io</groupId>
1725   - <artifactId>commons-io</artifactId>
1726   - </exclusion>
1727 1826 </exclusions>
1728 1827 </dependency>
1729 1828 <dependency>
... ...
... ... @@ -64,6 +64,11 @@
64 64 <scope>provided</scope>
65 65 </dependency>
66 66 <dependency>
  67 + <groupId>io.netty</groupId>
  68 + <artifactId>netty-tcnative-boringssl-static</artifactId>
  69 + <scope>provided</scope>
  70 + </dependency>
  71 + <dependency>
67 72 <groupId>com.google.guava</groupId>
68 73 <artifactId>guava</artifactId>
69 74 <scope>provided</scope>
... ...
... ... @@ -35,8 +35,6 @@
35 35 <properties>
36 36 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
37 37 <main.dir>${basedir}/../..</main.dir>
38   - <aws.sdk.version>1.11.747</aws.sdk.version>
39   - <google.common.protos.version>1.16.0</google.common.protos.version>
40 38 </properties>
41 39
42 40 <dependencies>
... ... @@ -93,7 +91,6 @@
93 91 <dependency>
94 92 <groupId>com.amazonaws</groupId>
95 93 <artifactId>aws-java-sdk-sns</artifactId>
96   - <version>${aws.sdk.version}</version>
97 94 </dependency>
98 95 <dependency>
99 96 <groupId>com.google.cloud</groupId>
... ... @@ -102,7 +99,6 @@
102 99 <dependency>
103 100 <groupId>com.google.api.grpc</groupId>
104 101 <artifactId>proto-google-common-protos</artifactId>
105   - <version>${google.common.protos.version}</version>
106 102 </dependency>
107 103 <dependency>
108 104 <groupId>com.rabbitmq</groupId>
... ...