Skip to content

Commit 6755869

Browse files
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 9f168b0 commit 6755869

File tree

4 files changed

+15
-70
lines changed

4 files changed

+15
-70
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
@@ -43,9 +43,11 @@ dependencies {
4343
api group: 'io.prometheus', name: 'simpleclient', version: '0.15.0'
4444
api group: 'io.prometheus', name: 'simpleclient_httpserver', version: '0.15.0'
4545
api group: 'io.prometheus', name: 'simpleclient_hotspot', version: '0.15.0'
46-
api 'org.aspectj:aspectjrt:1.8.13'
47-
api 'org.aspectj:aspectjweaver:1.8.13'
48-
api 'org.aspectj:aspectjtools:1.8.13'
46+
// https://openjdk.org/jeps/396, JEP 396: Strongly Encapsulate JDK Internals by Default
47+
// https://eclipse.dev/aspectj/doc/latest/release/JavaVersionCompatibility.html
48+
api 'org.aspectj:aspectjrt:1.9.8'
49+
api 'org.aspectj:aspectjweaver:1.9.8'
50+
api 'org.aspectj:aspectjtools:1.9.8'
4951
api group: 'io.github.tronprotocol', name: 'libp2p', version: '2.2.5',{
5052
exclude group: 'io.grpc', module: 'grpc-context'
5153
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.

0 commit comments

Comments
 (0)