Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update various dependencies #556

Merged
merged 4 commits into from
Apr 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 22.4.1

### Features Added
- Update various library dependencies

---
## 22.4.0

### Breaking Changes
Expand Down
21 changes: 19 additions & 2 deletions gradle/license-report-config/allowed-licenses.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,17 @@
},
{
"moduleLicense": "IAIK of Graz University of Technology License",
"moduleVersion": "1.4.8",
"moduleName": "org.xipki.iaik:sunpkcs11-wrapper"
},
{
"moduleLicense": "Unicode/ICU License",
"moduleVersion": "58.2",
"moduleName": "com.ibm.icu:icu4j"
},
{
"moduleName": "io.netty:netty-tcnative-classes"
},
{
"moduleName": "org.antlr:ST4"
}
],
"overrideLicenses": [
Expand Down Expand Up @@ -122,6 +123,22 @@
{
"moduleName": "io.netty:netty-tcnative-classes",
"moduleLicense": "Apache License, Version 2.0"
},
{
"moduleName": "org.antlr:ST4",
"moduleLicense": "The BSD License"
},
{
"moduleName": "com.google.protobuf:protobuf-java",
"moduleLicense": "The BSD License"
},
{
"moduleName": "com.google.protobuf:protobuf-java-util",
"moduleLicense": "The BSD License"
},
{
"moduleName": "org.java-websocket:Java-WebSocket",
"moduleLicense": "MIT License"
}
]
}
33 changes: 22 additions & 11 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

dependencyManagement {
dependencies {
dependency 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1'
dependency 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
siladu marked this conversation as resolved.
Show resolved Hide resolved
dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2'

dependencySet(group: 'com.google.errorprone', version: '2.10.0') {
entry 'error_prone_annotation'
Expand All @@ -31,7 +31,7 @@ dependencyManagement {

dependency 'info.picocli:picocli:4.6.2'

dependencySet(group: 'io.vertx', version: '4.2.3') {
dependencySet(group: 'io.vertx', version: '4.2.6') {
entry 'vertx-codegen'
entry 'vertx-core'
entry 'vertx-unit'
Expand All @@ -50,7 +50,7 @@ dependencyManagement {
entry 'log4j-slf4j-impl'
}

dependencySet(group: 'org.apache.tuweni', version: '2.1.0') {
dependencySet(group: 'org.apache.tuweni', version: '2.2.0') {
entry 'tuweni-net'
entry 'tuweni-toml'
entry 'tuweni-bytes'
Expand Down Expand Up @@ -80,8 +80,8 @@ dependencyManagement {
entry 'mockito-junit-jupiter'
}

dependency 'org.hyperledger.besu:plugin-api:21.10.9'
dependency 'org.hyperledger.besu.internal:metrics-core:21.10.9'
dependency 'org.hyperledger.besu:plugin-api:22.1.3'
dependency 'org.hyperledger.besu.internal:metrics-core:22.1.3'

dependencySet(group: 'tech.pegasys.teku.internal', version: '22.3.1') {
entry 'bls'
Expand All @@ -97,7 +97,7 @@ dependencyManagement {

dependency 'tech.pegasys:jblst:0.3.6-4'

dependencySet(group: 'tech.pegasys.signers.internal', version: '2.2.0') {
dependencySet(group: 'tech.pegasys.signers.internal', version: '2.2.1') {
entry 'bls-keystore'
entry 'keystorage-hashicorp'
entry 'keystorage-azure'
Expand All @@ -111,9 +111,9 @@ dependencyManagement {

dependency 'io.rest-assured:rest-assured:4.4.0'
dependency 'org.zeroturnaround:zt-exec:1.12'
dependency 'org.web3j:core:4.8.9'
// explicit declaring to override Java-WebSocket:1.3.8 transitive in web3j:core:4.8.9
dependency 'org.java-websocket:Java-WebSocket:1.5.2'
dependency('org.web3j:core:4.9.1') {
exclude group: 'com.github.jnr', name: 'jnr-unixsocket'
}

dependency 'com.github.arteam:simple-json-rpc-server:1.2'
dependency 'com.github.arteam:simple-json-rpc-client:1.2'
Expand Down Expand Up @@ -143,5 +143,16 @@ dependencyManagement {
entry 'auth'
entry 'secretsmanager'
}

// explicit declaring to override older versions with vulnerabilities
dependencySet(group: 'com.google.protobuf', version: '3.19.4') {
/*
com.google.protobuf:protobuf-java*:3.11.4 -> 3.19.4
\--- io.jaegertracing:jaeger-proto:0.7.0
\--- org.hyperledger.besu.internal:metrics-core:22.1.3
*/
entry 'protobuf-java'
entry 'protobuf-java-util'
}
}
}
}