Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit e0c0bf2

Browse files
authored
Update various dependency versions (#451)
* Update version for Tuweni and signers library * Remove kotlin forced dependency * Update licenses check * Fix Java-WebSocket license reporting * Updating various versions * Update Besu version to 22.1.3 * Changelog
1 parent b17d186 commit e0c0bf2

File tree

4 files changed

+47
-17
lines changed

4 files changed

+47
-17
lines changed

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22

33
## Upcoming Release
44
### Breaking Changes
5-
- Update Metrics service default port from 8546 to 9546.
5+
- Updated Metrics service default port from 8546 to 9546.
66

7+
### Features Added
8+
- Updated various dependent libraries versions
9+
10+
---
711
## 22.1.0
812
### Features Added
913
- Updated Tuweni dependency to version 2.1.0 [#432](https://github.com/ConsenSys/ethsigner/pull/432)
1014
- Updated Besu dependency to version 22.1.0 [#436](https://github.com/ConsenSys/ethsigner/pull/436)
11-
15+
---
1216
## 21.10.9
1317
### Breaking Changes
1418
- Update EthSigner docker image user to use `ethsigner` instead of `root`. It may result in backward compatibility/permission issues with existing directory mounts.

gradle.properties

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
besuVersion=22.1.3
2+
besuDistroUrl=https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/${besuVersion}/besu-${besuVersion}.tar.gz
3+
hashicorpVaultVersion=1.9.2
4+
hashicorpVaultUrl=https://releases.hashicorp.com/vault
5+
16
# Set exports/opens flags required by Google Java Format and ErrorProne plugins. (JEP-396)
27
org.gradle.jvmargs=-Xmx1g \
38
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
@@ -11,7 +16,4 @@ org.gradle.jvmargs=-Xmx1g \
1116
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
1217
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
1318
--add-opens jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
14-
besuVersion=22.1.0
15-
besuDistroUrl=https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/${besuVersion}/besu-${besuVersion}.tar.gz
16-
hashicorpVaultVersion=1.9.2
17-
hashicorpVaultUrl=https://releases.hashicorp.com/vault
19+

gradle/license-report-config/allowed-licenses.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@
6565
},
6666
{
6767
"moduleLicense": "Unicode/ICU License",
68-
"moduleVersion": "58.2",
6968
"moduleName": "com.ibm.icu:icu4j"
69+
},
70+
{
71+
"moduleName": "org.antlr:ST4"
7072
}
7173
],
7274
"overrideLicenses": [
@@ -113,6 +115,18 @@
113115
{
114116
"moduleName": "io.netty:netty-tcnative-classes",
115117
"moduleLicense": "Apache License, Version 2.0"
118+
},
119+
{
120+
"moduleName": "org.antlr:ST4",
121+
"moduleLicense": "The BSD License"
122+
},
123+
{
124+
"moduleName": "com.google.protobuf:protobuf-java",
125+
"moduleLicense": "The BSD License"
126+
},
127+
{
128+
"moduleName": "org.java-websocket:Java-WebSocket",
129+
"moduleLicense": "MIT License"
116130
}
117131
]
118132
}

gradle/versions.gradle

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@
1313

1414
dependencyManagement {
1515
dependencies {
16-
dependencySet(group: 'com.google.errorprone', version: '2.10.0') {
16+
dependencySet(group: 'com.google.errorprone', version: '2.11.0') {
1717
entry 'error_prone_annotation'
1818
entry 'error_prone_check_api'
1919
entry 'error_prone_core'
2020
entry 'error_prone_test_helpers'
2121
}
2222

23-
dependency 'com.google.guava:guava:31.0.1-jre'
23+
dependency 'com.google.guava:guava:31.1-jre'
2424

2525
dependency 'com.squareup.okhttp3:okhttp:4.9.3'
2626

2727
dependency 'commons-io:commons-io:2.11.0'
2828

29-
dependency 'info.picocli:picocli:4.6.2'
29+
dependency 'info.picocli:picocli:4.6.3'
3030

3131
dependency 'io.rest-assured:rest-assured:4.4.0'
3232

33-
dependencySet(group: 'io.vertx', version: '4.2.3') {
33+
dependencySet(group: 'io.vertx', version: '4.2.6') {
3434
entry 'vertx-codegen'
3535
entry 'vertx-core'
3636
entry 'vertx-unit'
@@ -40,13 +40,13 @@ dependencyManagement {
4040

4141
dependency 'javax.activation:activation:1.1.1'
4242

43-
dependencySet(group: 'org.apache.logging.log4j', version: '2.17.1') {
43+
dependencySet(group: 'org.apache.logging.log4j', version: '2.17.2') {
4444
entry 'log4j-api'
4545
entry 'log4j-core'
4646
entry 'log4j-slf4j-impl'
4747
}
4848

49-
dependencySet(group: 'org.apache.tuweni', version: '2.1.0') {
49+
dependencySet(group: 'org.apache.tuweni', version: '2.2.0') {
5050
entry 'tuweni-net'
5151
entry 'tuweni-toml'
5252
}
@@ -74,15 +74,15 @@ dependencyManagement {
7474
entry 'mockito-junit-jupiter'
7575
}
7676

77-
dependencySet(group: 'org.web3j', version: '4.8.9') {
77+
dependencySet(group: 'org.web3j', version: '4.9.0') {
7878
entry 'besu'
7979
entry ('core') {
8080
exclude group: 'com.github.jnr', name: 'jnr-unixsocket'
8181
}
8282
entry 'crypto'
8383
}
8484

85-
dependencySet(group: 'tech.pegasys.signers.internal', version: '2.0.0') {
85+
dependencySet(group: 'tech.pegasys.signers.internal', version: '2.2.1') {
8686
entry 'keystorage-hashicorp'
8787
entry 'signing-secp256k1-api'
8888
entry 'signing-secp256k1-impl'
@@ -93,8 +93,18 @@ dependencyManagement {
9393
dependency "org.hyperledger.besu:plugin-api:${besuVersion}"
9494
dependency "org.hyperledger.besu.internal:metrics-core:${besuVersion}"
9595

96-
// explicit declaring to override older versions with vulnerabilities
96+
// explicit declaring to override transitive dependencies with vulnerabilities
97+
dependency 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
9798
dependency 'org.java-websocket:Java-WebSocket:1.5.2'
98-
dependency 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.21'
99+
dependency 'com.google.protobuf:protobuf-java:3.19.4'
100+
dependencySet(group: 'io.grpc', version: '1.45.1') {
101+
entry 'grpc-api'
102+
entry 'grpc-context'
103+
entry 'grpc-core'
104+
entry 'grpc-netty'
105+
entry 'grpc-protobuf'
106+
entry 'grpc-protobuf-lite'
107+
entry 'grpc-stub'
108+
}
99109
}
100110
}

0 commit comments

Comments
 (0)