Update various dependencies (#556)

Consensys · Apr 28, 2022 · 31a68ff · 31a68ff
1 parent dba20c8
commit 31a68ff
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 22.4.1
+
+### Features Added
+- Update various library dependencies
+
+---
 ## 22.4.0
 
 ### Breaking Changes

diff --git a/gradle/license-report-config/allowed-licenses.json b/gradle/license-report-config/allowed-licenses.json
@@ -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": [
@@ -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"
     }
   ]
 }
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -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'
+    dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2'
 
     dependencySet(group: 'com.google.errorprone', version: '2.10.0') {
       entry 'error_prone_annotation'
@@ -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'
@@ -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'
@@ -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'
@@ -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'
@@ -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'
@@ -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'
+    }
   }
-}
+}