Skip to content

Commit

Permalink
Upgrade dependencies (#6377)
Browse files Browse the repository at this point in the history 
* Bump com.github.oshi:oshi-core to 6.4.10

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump com.github.tomakehurst to org.wiremock 3.3.1

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump com.google.auto.service:auto-service to 1.1.1

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump com.google.dagger group to 2.50

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump com.graphql-java:graphql-java to 21.3

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump com.splunk.logging:splunk-library-javalogging to 1.11.8

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump com.squareup.okhttp3:okhttp to 4.12.0
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump commons-io:commons-io to 2.15.1

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump dnsjava:dnsjava to 3.5.3

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump info.picocli group to 4.7.5

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump io.grpc group to 1.60.1

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump io.kubernetes:client-java to 18.0.1

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump io.netty group to 4.1.104.Final

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump net.java.dev.jna:jna to 5.14.0

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.apache.commons:commons-compress to 1.25.0

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.apache.commons:commons-lang3 to 3.14.0

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.apache.commons:commons-text to 1.11.0

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.apache.logging.log4j group to 2.22.1

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Redorder io.tmio group

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.assertj:assertj-core to 3.25.1

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.bouncycastle group to 1.77

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.fusesource.jansi:jansi to 2.4.1

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.immutables group 2.10.0

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.java-websocket:Java-WebSocket to 1.5.5

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.jetbrains.kotlin:kotlin-stdlib to 1.9.22

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.junit.jupiter group to 5.10.1

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.jupnp group to 2.7.1

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.rocksdb:rocksdbjni to 8.9.1

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.slf4j group to 2.0.10

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.springframework.security:spring-security-crypto to 6.2.1

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.testcontainers:testcontainers to 1.19.3

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.web3j group to 4.10.3

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Bump org.xerial.snappy:snappy-java to 1.1.10.5

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Regenerate gradle verification metadata

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Update commons-codec:commons-codec to 1.16.0

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Update org.junit.vintage:junit-vintage-engine to 5.10.1

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

* Update CHANGELOG

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

---------

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
  • Loading branch information
@fab-10
fab-10 authored Jan 11, 2024
1 parent f21b705 commit f721c1c
Show file tree
Hide file tree
Showing 7 changed files with 1,090 additions and 1,922 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
### Additions and Improvements
- Optimize RocksDB WAL files, allows for faster restart and a more linear disk space utilization [#6328](https://github.com/hyperledger/besu/pull/6328)
- Disable transaction handling when the node is not in sync, to avoid unnecessary transaction validation work [#6302](https://github.com/hyperledger/besu/pull/6302)
- Upgrade dependencies [#6377](https://github.com/hyperledger/besu/pull/6377)

### Bug fixes
- INTERNAL_ERROR from `eth_estimateGas` JSON/RPC calls [#6344](https://github.com/hyperledger/besu/issues/6344)
Expand Down
2 changes: 1 addition & 1 deletion acceptance-tests/dsl/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ dependencies {
implementation project(':testutil')
implementation project(':util')

implementation 'com.github.tomakehurst:wiremock-jre8'
implementation 'com.google.guava:guava'
implementation 'com.google.dagger:dagger'
annotationProcessor 'com.google.dagger:dagger-compiler'
Expand All @@ -45,6 +44,7 @@ dependencies {
implementation 'org.web3j:abi'
implementation 'org.web3j:besu'
implementation 'org.web3j:crypto'
implementation 'org.wiremock:wiremock'

implementation 'org.testcontainers:testcontainers'
implementation 'org.junit.jupiter:junit-jupiter'
Expand Down
2 changes: 1 addition & 1 deletion acceptance-tests/tests/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ dependencies {
testImplementation project(':testutil')
testImplementation project(':util')

testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone'
testImplementation 'commons-io:commons-io'
testImplementation 'io.grpc:grpc-all'
testImplementation 'io.grpc:grpc-core'
Expand Down Expand Up @@ -84,6 +83,7 @@ dependencies {
testImplementation 'org.web3j:abi'
testImplementation 'org.web3j:besu'
testImplementation 'org.web3j:core'
testImplementation 'org.wiremock:wiremock'

testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
}
Expand Down
4 changes: 4 additions & 0 deletions gradle/allowed-licenses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@
"moduleLicense": "Eclipse Public License - v 1.0",
"moduleVersion": "4.13.2",
"moduleName": "junit:junit"
},
{
"moduleName": "org.jetbrains.kotlin:kotlin-stdlib-common",
"moduleVersion": "1.9.22"
}
]
}
2 changes: 1 addition & 1 deletion gradle/license-normalizer-bundle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
{ "bundleName" : "Apache-2.0", "licenseNamePattern" : ".*Apache License,?( Version)? 2.*" },
{ "bundleName" : "Apache-2.0", "licenseUrlPattern" : ".*(www\\.)?opensource\\.org/licenses/Apache-2\\.0.*" },
{ "bundleName" : "Apache-2.0", "licenseUrlPattern" : ".*www\\.apache\\.org/licenses/LICENSE-2\\.0.*" },
{ "bundleName" : "LGPL-2.1-only", "licenseUrlPattern" : ".*www\\.gnu\\.org/licenses/old-licenses/lgpl-2\\.1\\.html" },
{ "bundleName" : "Apache-2.0", "licenseFileContentPattern" : ".*Apache License,?( Version)? 2.*" },
{ "bundleName" : "Apache-1.1", "licenseFileContentPattern" : ".*Apache Software License, Version 1\\.1.*" },
{ "bundleName" : "LGPL-2.1-only", "licenseUrlPattern" : ".*www\\.gnu\\.org/licenses/old-licenses/lgpl-2\\.1\\.html" },
{ "bundleName" : "CC0-1.0", "licenseNamePattern" : "CC0(( |-)1(\\.0)?)?" },
{ "bundleName" : "CC0-1.0", "licenseUrlPattern" : ".*(www\\.)?creativecommons\\.org/publicdomain/zero/1\\.0/" },
{ "bundleName" : "CDDL-1.0", "licenseFileContentPattern" : ".*CDDL.*1\\.0" },
Expand Down
2,892 changes: 1,028 additions & 1,864 deletions gradle/verification-metadata.xml
View file

Large diffs are not rendered by default.

109 changes: 54 additions & 55 deletions gradle/versions.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,11 @@ dependencyManagement {

dependency 'com.github.ben-manes.caffeine:caffeine:3.1.8'

dependencySet(group: 'com.github.tomakehurst', version: '2.35.0') {
entry'wiremock-jre8-standalone'
entry'wiremock-jre8'
}
dependency 'com.github.oshi:oshi-core:6.4.10'

dependency 'com.google.auto.service:auto-service:1.0.1'
dependency 'com.google.auto.service:auto-service:1.1.1'

dependencySet(group: 'com.google.dagger', version: '2.45') {
dependencySet(group: 'com.google.dagger', version: '2.50') {
entry'dagger-compiler'
entry'dagger'
}
Expand All @@ -51,37 +48,37 @@ dependencyManagement {

dependency 'com.google.guava:guava:31.1-jre'

dependency 'com.graphql-java:graphql-java:20.1'
dependency 'com.graphql-java:graphql-java:21.3'

dependency 'com.splunk.logging:splunk-library-javalogging:1.11.5'
dependency 'com.splunk.logging:splunk-library-javalogging:1.11.8'

dependency 'com.squareup.okhttp3:okhttp:4.10.0'
dependency 'com.squareup.okhttp3:okhttp:4.12.0'

dependency 'commons-codec:commons-codec:1.15'
dependency 'commons-codec:commons-codec:1.16.0'

dependency 'commons-io:commons-io:2.11.0'
dependency 'commons-io:commons-io:2.15.1'

dependency 'dnsjava:dnsjava:3.5.2'
dependency 'dnsjava:dnsjava:3.5.3'

dependencySet(group: 'info.picocli', version: '4.7.1') {
dependencySet(group: 'info.picocli', version: '4.7.5') {
entry 'picocli'
entry 'picocli-codegen'
}

dependencySet(group: 'io.grpc', version: '1.59.0') {
dependencySet(group: 'io.grpc', version: '1.60.1') {
entry 'grpc-all'
entry 'grpc-core'
entry 'grpc-netty'
entry 'grpc-stub'
}

dependency 'io.kubernetes:client-java:18.0.0'
dependency 'io.kubernetes:client-java:18.0.1'

dependency 'io.netty:netty-all:4.1.100.Final'
dependency 'io.netty:netty-all:4.1.104.Final'
dependency 'io.netty:netty-tcnative-boringssl-static:2.0.62.Final'
dependency group: 'io.netty', name: 'netty-transport-native-epoll', version:'4.1.100.Final', classifier: 'linux-x86_64'
dependency group: 'io.netty', name: 'netty-transport-native-kqueue', version:'4.1.100.Final', classifier: 'osx-x86_64'
dependency 'io.netty:netty-transport-native-unix-common:4.1.100.Final'
dependency group: 'io.netty', name: 'netty-transport-native-epoll', version:'4.1.104.Final', classifier: 'linux-x86_64'
dependency group: 'io.netty', name: 'netty-transport-native-kqueue', version:'4.1.104.Final', classifier: 'osx-x86_64'
dependency 'io.netty:netty-transport-native-unix-common:4.1.104.Final'

dependency 'io.opentelemetry:opentelemetry-api:1.24.0'
dependency 'io.opentelemetry:opentelemetry-exporter-otlp:1.24.0'
Expand All @@ -108,6 +105,20 @@ dependencyManagement {

dependency 'io.reactivex.rxjava2:rxjava:2.2.21'

dependencySet(group: 'io.tmio', version: '2.4.2') {
entry 'tuweni-bytes'
entry 'tuweni-config'
entry 'tuweni-concurrent'
entry 'tuweni-crypto'
entry 'tuweni-devp2p'
entry 'tuweni-dns-discovery'
entry 'tuweni-io'
entry 'tuweni-net'
entry 'tuweni-rlp'
entry 'tuweni-toml'
entry 'tuweni-units'
}

dependencySet(group: 'io.vertx', version: '4.3.5') {
entry 'vertx-auth-jwt'
entry 'vertx-codegen'
Expand All @@ -121,43 +132,29 @@ dependencyManagement {

dependency 'junit:junit:4.13.2'

dependency 'net.java.dev.jna:jna:5.13.0'
dependency 'net.java.dev.jna:jna:5.14.0'

dependency 'org.apache.commons:commons-compress:1.23.0'
dependency 'org.apache.commons:commons-lang3:3.12.0'
dependency 'org.apache.commons:commons-text:1.10.0'
dependency 'org.apache.commons:commons-compress:1.25.0'
dependency 'org.apache.commons:commons-lang3:3.14.0'
dependency 'org.apache.commons:commons-text:1.11.0'

dependencySet(group: 'org.apache.logging.log4j', version: '2.20.0') {
dependencySet(group: 'org.apache.logging.log4j', version: '2.22.1') {
entry 'log4j-api'
entry 'log4j-core'
entry 'log4j-jul'
entry 'log4j-slf4j2-impl'
}

dependencySet(group: 'io.tmio', version: '2.4.2') {
entry 'tuweni-bytes'
entry 'tuweni-config'
entry 'tuweni-concurrent'
entry 'tuweni-crypto'
entry 'tuweni-devp2p'
entry 'tuweni-dns-discovery'
entry 'tuweni-io'
entry 'tuweni-net'
entry 'tuweni-rlp'
entry 'tuweni-toml'
entry 'tuweni-units'
}

dependency 'org.assertj:assertj-core:3.24.2'
dependency 'org.assertj:assertj-core:3.25.1'

dependency 'org.awaitility:awaitility:4.2.0'

dependencySet(group: 'org.bouncycastle', version: '1.76') {
dependencySet(group: 'org.bouncycastle', version: '1.77') {
entry'bcpkix-jdk18on'
entry'bcprov-jdk18on'
}

dependency 'org.fusesource.jansi:jansi:2.4.0'
dependency 'org.fusesource.jansi:jansi:2.4.1'
dependency 'org.openjdk.jol:jol-core:0.17'
dependency 'tech.pegasys:jc-kzg-4844:0.8.0'

Expand All @@ -170,16 +167,16 @@ dependencyManagement {
entry 'blake2bf'
}

dependencySet(group: 'org.immutables', version: '2.9.3') {
dependencySet(group: 'org.immutables', version: '2.10.0') {
entry 'value-annotations'
entry 'value'
}

dependency 'org.java-websocket:Java-WebSocket:1.5.3'
dependency 'org.java-websocket:Java-WebSocket:1.5.5'

dependency 'org.jetbrains.kotlin:kotlin-stdlib:1.8.10'
dependency 'org.jetbrains.kotlin:kotlin-stdlib:1.9.22'

dependencySet(group: 'org.junit.jupiter', version: '5.8.2') {
dependencySet(group: 'org.junit.jupiter', version: '5.10.1') {
entry 'junit-jupiter'
entry 'junit-jupiter-api'
entry 'junit-jupiter-engine'
Expand All @@ -188,9 +185,9 @@ dependencyManagement {

dependency 'org.junit.platform:junit-platform-runner:1.9.2'

dependency 'org.junit.vintage:junit-vintage-engine:5.9.2'
dependency 'org.junit.vintage:junit-vintage-engine:5.10.1'

dependencySet(group: 'org.jupnp', version:'2.7.0') {
dependencySet(group: 'org.jupnp', version:'2.7.1') {
entry 'org.jupnp.support'
entry 'org.jupnp'
}
Expand All @@ -207,31 +204,33 @@ dependencyManagement {

dependency 'org.owasp.encoder:encoder:1.2.3'

dependency 'org.rocksdb:rocksdbjni:8.3.2'
dependency 'org.rocksdb:rocksdbjni:8.9.1'

dependencySet(group: 'org.slf4j', version:'2.0.7') {
dependencySet(group: 'org.slf4j', version:'2.0.10') {
entry 'slf4j-api'
entry 'slf4j-nop'
}

dependency 'org.springframework.security:spring-security-crypto:6.0.2'
dependency 'org.springframework.security:spring-security-crypto:6.2.1'

dependency 'org.testcontainers:testcontainers:1.17.6'
dependency 'org.testcontainers:testcontainers:1.19.3'

dependency 'org.web3j:quorum:4.9.5'
dependencySet(group: 'org.web3j', version: '4.9.7') {
dependencySet(group: 'org.web3j', version: '4.10.3') {
entry 'abi'
entry 'besu'
entry 'core'
entry 'crypto'
}

dependency 'org.xerial.snappy:snappy-java:1.1.9.1'
dependencySet(group: 'org.wiremock', version: '3.3.1') {
entry 'wiremock'
}

dependency 'org.xerial.snappy:snappy-java:1.1.10.5'

dependency 'org.yaml:snakeyaml:2.0'

dependency 'tech.pegasys.discovery:discovery:22.2.0'

dependency 'com.github.oshi:oshi-core:6.4.1'
}
}

0 comments on commit f721c1c

Please sign in to comment.