Skip to content

Commit cfb0316

Browse files
halibobo1205halibobo1205
committed
feat(dependencies): update dependencies for jdk17
 add javax.jws-api:1.1 and javax.annotation-api:1.3.2, refs:JDK-8190378, JEP 320 remove com.carrotsearch:java-sizeof:0.0.5 bump lombok from 1.18.12 to 1.18.34, refs: [Lombok Changelog](https://projectlombok.org/changelog) bump aspectjrt from 1.18.13 to 1.9.8, refs: [AspectJ Java version compatibility](https://eclipse.dev/aspectj/doc/latest/release/JavaVersionCompatibility.html)
1 parent d7046a5 commit cfb0316

File tree

5 files changed

+51
-98
lines changed

5 files changed

+51
-98
lines changed

‎build.gradle‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,16 @@ subprojects {
4949
implementation group: 'joda-time', name: 'joda-time', version: '2.3'
5050
implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
5151

52-
compileOnly 'org.projectlombok:lombok:1.18.12'
53-
annotationProcessor 'org.projectlombok:lombok:1.18.12'
54-
testCompileOnly 'org.projectlombok:lombok:1.18.12'
55-
testAnnotationProcessor 'org.projectlombok:lombok:1.18.12'
52+
compileOnly 'org.projectlombok:lombok:1.18.34'
53+
annotationProcessor 'org.projectlombok:lombok:1.18.34'
54+
testCompileOnly 'org.projectlombok:lombok:1.18.34'
55+
testAnnotationProcessor 'org.projectlombok:lombok:1.18.34'
56+
57+
// https://www.oracle.com/java/technologies/javase/11-relnote-issues.html#JDK-8190378
58+
implementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
59+
// for json-rpc, see https://github.com/briandilley/jsonrpc4j/issues/278
60+
implementation group: 'javax.jws', name: 'javax.jws-api', version: '1.1'
61+
annotationProcessor group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
5662

5763
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
5864
testImplementation "org.mockito:mockito-core:4.11.0"

‎common/build.gradle‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ dependencies {
4141
api group: 'io.prometheus', name: 'simpleclient', version: '0.15.0'
4242
api group: 'io.prometheus', name: 'simpleclient_httpserver', version: '0.15.0'
4343
api group: 'io.prometheus', name: 'simpleclient_hotspot', version: '0.15.0'
44-
api 'org.aspectj:aspectjrt:1.8.13'
45-
api 'org.aspectj:aspectjweaver:1.8.13'
46-
api 'org.aspectj:aspectjtools:1.8.13'
44+
// https://openjdk.org/jeps/396, JEP 396: Strongly Encapsulate JDK Internals by Default
45+
// https://eclipse.dev/aspectj/doc/latest/release/JavaVersionCompatibility.html
46+
api 'org.aspectj:aspectjrt:1.9.8'
47+
api 'org.aspectj:aspectjweaver:1.9.8'
48+
api 'org.aspectj:aspectjtools:1.9.8'
4749
api group: 'io.github.tronprotocol', name: 'libp2p', version: '2.2.5',{
4850
exclude group: 'io.grpc', module: 'grpc-context'
4951
exclude group: 'io.grpc', module: 'grpc-core'

‎framework/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ dependencies {
4343
implementation group: 'com.google.inject', name: 'guice', version: '4.1.0'
4444
implementation group: 'io.dropwizard.metrics', name: 'metrics-core', version: '3.1.2'
4545
implementation group: 'com.github.davidb', name: 'metrics-influxdb', version: '0.8.2'
46-
implementation group: 'com.carrotsearch', name: 'java-sizeof', version: '0.0.5'
4746
// http
4847
implementation 'org.eclipse.jetty:jetty-server:9.4.53.v20231009'
4948
implementation 'org.eclipse.jetty:jetty-servlet:9.4.53.v20231009'

‎framework/src/test/java/org/tron/common/utils/ObjectSizeUtilTest.java‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎gradle/verification-metadata.xml‎

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,6 @@
150150
<sha256 value="6fee231c0aeee6de1256b6b5590ce9e6f6cf6c39797ed668573520bc3412e2a7" origin="Generated by Gradle"/>
151151
</artifact>
152152
</component>
153-
<component group="com.carrotsearch" name="java-sizeof" version="0.0.5">
154-
<artifact name="java-sizeof-0.0.5.jar">
155-
<sha256 value="3061a3a8178da337314aa05f0e03adfab6db10b53e826366cb5a3d6ecf41418a" origin="Generated by Gradle"/>
156-
</artifact>
157-
<artifact name="java-sizeof-0.0.5.pom">
158-
<sha256 value="4df77ac8d6040d484cbc57c643dd49913715d4fd53174609c25b5f87e4370074" origin="Generated by Gradle"/>
159-
</artifact>
160-
</component>
161153
<component group="com.cedarsoftware" name="java-util" version="1.8.0">
162154
<artifact name="java-util-1.8.0.jar">
163155
<sha256 value="2bd8d30048fdd441a1a2b9b53f27b59a4a7823e70e4989035233ec20a0f03386" origin="Generated by Gradle"/>
@@ -1107,6 +1099,14 @@
11071099
<sha256 value="dea533d9cebe8d92ef260437026cc6cbd470ff94c7be2cfb69e91517bcff76ef" origin="Generated by Gradle"/>
11081100
</artifact>
11091101
</component>
1102+
<component group="javax.annotation" name="javax.annotation-api" version="1.3.2">
1103+
<artifact name="javax.annotation-api-1.3.2.jar">
1104+
<sha256 value="e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b" origin="Generated by Gradle"/>
1105+
</artifact>
1106+
<artifact name="javax.annotation-api-1.3.2.pom">
1107+
<sha256 value="46a4a251ca406e78e4853d7a2bae83282844a4992851439ee9a1f23716f06b97" origin="Generated by Gradle"/>
1108+
</artifact>
1109+
</component>
11101110
<component group="javax.el" name="javax.el-api" version="3.0.0">
11111111
<artifact name="javax.el-api-3.0.0.jar">
11121112
<sha256 value="8d21ac8c3a38027be27ff4c4fe24806ae2fc188559123253ddc7425066d78fa1" origin="Generated by Gradle"/>
@@ -1139,6 +1139,14 @@
11391139
<sha256 value="f7124fce14a43c8a25a48f7503149eb13dd95422ff2ba7f750c5398747790211" origin="Generated by Gradle"/>
11401140
</artifact>
11411141
</component>
1142+
<component group="javax.jws" name="javax.jws-api" version="1.1">
1143+
<artifact name="javax.jws-api-1.1.jar">
1144+
<sha256 value="9f20ab1fea3f9571ed52a9d98e3c651cc7c04c8a709addf238312b60987c6f2c" origin="Generated by Gradle"/>
1145+
</artifact>
1146+
<artifact name="javax.jws-api-1.1.pom">
1147+
<sha256 value="d8c05da74a04b997db37e23cc450689153199095dfbe7e5e47d1cc4494f5cd73" origin="Generated by Gradle"/>
1148+
</artifact>
1149+
</component>
11421150
<component group="javax.portlet" name="portlet-api" version="3.0.1">
11431151
<artifact name="portlet-api-3.0.1.jar">
11441152
<sha256 value="4be516af210947be9a41c298485e797e3877e4f3e73d92b6deb983dfa0b08d7d" origin="Generated by Gradle"/>
@@ -1540,28 +1548,28 @@
15401548
<sha256 value="edcda6e57e1e50dd0e4433e281ab8446f1af81deca2a7a1688cb776b1f842e89" origin="Generated by Gradle"/>
15411549
</artifact>
15421550
</component>
1543-
<component group="org.aspectj" name="aspectjrt" version="1.8.13">
1544-
<artifact name="aspectjrt-1.8.13.jar">
1545-
<sha256 value="de735bf2e2aaf2221863b1c0b3e6e92166cf8845d87814ec8a5b997c0c823dd8" origin="Generated by Gradle"/>
1551+
<component group="org.aspectj" name="aspectjrt" version="1.9.8">
1552+
<artifact name="aspectjrt-1.9.8.jar">
1553+
<sha256 value="b6a05e0a5dc22bb7cdcc429781bf493ee3c15e36b344188fcd88bc18ef70450e" origin="Generated by Gradle"/>
15461554
</artifact>
1547-
<artifact name="aspectjrt-1.8.13.pom">
1548-
<sha256 value="0630e29da7f2a3c290f07a8dbceb9c5b66b9d423a5c8dc0cf47b1bb16d357a5d" origin="Generated by Gradle"/>
1555+
<artifact name="aspectjrt-1.9.8.pom">
1556+
<sha256 value="2d24e829ac889993b4b5d625209c52dcc7e8afc4aae4fd579b2b9439a870fc9d" origin="Generated by Gradle"/>
15491557
</artifact>
15501558
</component>
1551-
<component group="org.aspectj" name="aspectjtools" version="1.8.13">
1552-
<artifact name="aspectjtools-1.8.13.jar">
1553-
<sha256 value="03db7bb0bff6f3bcbbc19dd5751bf5a2340c32d03f3d482ce8b2f4c5e958e114" origin="Generated by Gradle"/>
1559+
<component group="org.aspectj" name="aspectjtools" version="1.9.8">
1560+
<artifact name="aspectjtools-1.9.8.jar">
1561+
<sha256 value="7f884e7f59e700db147477de5bd081d8577f361e48a134112bc9c9246efda420" origin="Generated by Gradle"/>
15541562
</artifact>
1555-
<artifact name="aspectjtools-1.8.13.pom">
1556-
<sha256 value="6777eca66d5f12416821d457cf9dc33811f97f9e4691ab76d348778eef52a88f" origin="Generated by Gradle"/>
1563+
<artifact name="aspectjtools-1.9.8.pom">
1564+
<sha256 value="e55d18aaedb3f4cac7babab381e195b5f2fad98135dfb096d67332f30ccdc525" origin="Generated by Gradle"/>
15571565
</artifact>
15581566
</component>
1559-
<component group="org.aspectj" name="aspectjweaver" version="1.8.13">
1560-
<artifact name="aspectjweaver-1.8.13.jar">
1561-
<sha256 value="965d0928b0e07dcedb67f0d0a48653d36a6cff257e3270cb28ea48fef6c30a27" origin="Generated by Gradle"/>
1567+
<component group="org.aspectj" name="aspectjweaver" version="1.9.8">
1568+
<artifact name="aspectjweaver-1.9.8.jar">
1569+
<sha256 value="2f6a5d8491f776e850d0e4d0ac7da504b8108ba659130335272557c4c16cf71d" origin="Generated by Gradle"/>
15621570
</artifact>
1563-
<artifact name="aspectjweaver-1.8.13.pom">
1564-
<sha256 value="44a63fdf2fef7acf64313ae276991e4624bddcdaf2d025b91405aafa5f4baa01" origin="Generated by Gradle"/>
1571+
<artifact name="aspectjweaver-1.9.8.pom">
1572+
<sha256 value="5bf5e7cc262419930c174f96b30e49336c9aad37873191f58a8620f289de8a6f" origin="Generated by Gradle"/>
15651573
</artifact>
15661574
</component>
15671575
<component group="org.bouncycastle" name="bcpkix-jdk18on" version="1.79">
@@ -2080,12 +2088,12 @@
20802088
<sha256 value="bc970dc489b11a0f385be7af432f897c3aa373d767f237c02a0465fac0447580" origin="Generated by Gradle"/>
20812089
</artifact>
20822090
</component>
2083-
<component group="org.projectlombok" name="lombok" version="1.18.12">
2084-
<artifact name="lombok-1.18.12.jar">
2085-
<sha256 value="49381508ecb02b3c173368436ef71b24c0d4418ad260e6cc98becbcf4b345406" origin="Generated by Gradle"/>
2091+
<component group="org.projectlombok" name="lombok" version="1.18.34">
2092+
<artifact name="lombok-1.18.34.jar">
2093+
<sha256 value="c27d6b2aff56241d1b07fcbcc6b183709e6b432c80f7374eeb1d823e86d4b81a" origin="Generated by Gradle"/>
20862094
</artifact>
2087-
<artifact name="lombok-1.18.12.pom">
2088-
<sha256 value="bca2bb252c6ec5db92584af7ab26f787b14a155f587c3e30ec1e1da0d4164694" origin="Generated by Gradle"/>
2095+
<artifact name="lombok-1.18.34.pom">
2096+
<sha256 value="e1909fe272cffc89ff289b1321e89b641fef739821661bb693a6f966a17ed9e5" origin="Generated by Gradle"/>
20892097
</artifact>
20902098
</component>
20912099
<component group="org.reactivestreams" name="reactive-streams" version="1.0.3">

0 commit comments

Comments
 (0)