vacp2p/status-linea-besu
1
0
Fork 0
mirror of https://github.com/vacp2p/status-linea-besu.git synced 2026-01-08 21:38:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Dependency Version Updates for 22.7.0-RC1 (#4004)

Browse Source 
Update dependency versions.

Dependencies skipped because they require compatibility work
 * vertx
 * JMH
 * Prometheus
 * RocksDB
 * Web3j
 * Gradle

Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
This commit is contained in:
Danno Ferrin
2022-06-23 08:03:07 -06:00
committed by GitHub
parent 645fdd08ee
commit 755771d22c
27 changed files with 86 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acceptance-tests/test-plugins/build.gradle
View File

@@ -34,6 +34,4 @@ task testPluginsJar(type: Jar) {
artifacts { testPluginsJar }
javadoc {
enabled = false
}
javadoc { enabled = false }

24
acceptance-tests/tests/build.gradle
View File

@@ -13,18 +13,14 @@
plugins {
id 'org.web3j' version '4.8.9'
id 'org.web3j.solidity' version '0.3.3'
id 'org.web3j.solidity' version '0.3.5'
}
web3j {
generatedPackageName = 'org.hyperledger.besu.tests.web3j.generated'
}
web3j { generatedPackageName = 'org.hyperledger.besu.tests.web3j.generated' }
sourceSets.main.solidity.srcDirs = ["$projectDir/contracts"]
solidity {
resolvePackages = false
}
solidity { resolvePackages = false }
dependencies {
implementation project(':crypto')
@@ -77,9 +73,7 @@ dependencies {
testImplementation 'org.web3j:besu'
testImplementation 'org.web3j:core'
constraints {
implementation('jnr-posix:3.1.15') {
because '3.0.47 from web3j has issues'
}
implementation('jnr-posix:3.1.15') { because '3.0.47 from web3j has issues' }
}
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
@@ -88,11 +82,7 @@ dependencies {
test.enabled = false
sourceSets {
test {
resources {
srcDirs "${rootDir}/acceptance-tests/test-plugins/build/libs"
}
}
test { resources { srcDirs "${rootDir}/acceptance-tests/test-plugins/build/libs" } }
}
processTestResources.dependsOn(':acceptance-tests:test-plugins:testPluginsJar')
@@ -118,7 +108,5 @@ task acceptanceTest(type: Test) {
showCauses = true
}
doFirst {
mkdir "${buildDir}/jvmErrorLogs"
}
doFirst { mkdir "${buildDir}/jvmErrorLogs" }
}

4
besu/build.gradle
View File

@@ -99,9 +99,7 @@ dependencies {
testImplementation 'tech.pegasys.discovery:discovery'
constraints {
implementation('com.github.jnr:jnr-posix') {
version {
require '3.1.15'
}
version { require '3.1.15' }
because '3.0.47 from web3j has issues'
}
}

40
build.gradle
View File

@@ -20,15 +20,15 @@ import net.ltgt.gradle.errorprone.CheckSeverity
import java.text.SimpleDateFormat
plugins {
id 'com.diffplug.spotless' version '5.16.0'
id 'com.diffplug.spotless' version '6.7.2'
id 'com.github.ben-manes.versions' version '0.42.0'
id 'com.github.hierynomus.license' version '0.16.1-fix'
id 'com.jfrog.artifactory' version '4.27.1'
id 'com.jfrog.artifactory' version '4.28.3'
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'me.champeau.jmh' version '0.6.6' apply false
id 'net.ltgt.errorprone' version '2.0.2'
id 'maven-publish'
id 'org.sonarqube' version '3.3'
id 'org.sonarqube' version '3.4.0.2513'
}
sonarqube {
@@ -139,7 +139,7 @@ allprojects {
}
groovyGradle {
target '*.gradle'
greclipse().configFile(rootProject.file('gradle/formatter.properties'))
greclipse('4.6.3').configFile(rootProject.file('gradle/formatter.properties'))
endWithNewline()
}
// Below this line are currently only license header tasks
@@ -307,9 +307,7 @@ subprojects {
}
}
dependencies {
testImplementation sourceSets.testSupport.output
}
dependencies { testImplementation sourceSets.testSupport.output }
task testSupportJar(type: Jar) {
archiveBaseName = "${project.name}-support-test"
@@ -331,9 +329,7 @@ subprojects {
}
if (file('src/test-support').directory) {
dependencies {
integrationTestImplementation sourceSets.testSupport.output
}
dependencies { integrationTestImplementation sourceSets.testSupport.output }
}
task integrationTest(type: Test, dependsOn: ["compileTestJava"]) {
@@ -520,9 +516,7 @@ def tweakStartScript(createScriptTask) {
startScripts {
unixStartScriptGenerator.template = resources.text.fromFile("${projectDir}/besu/src/main/scripts/unixStartScript.txt")
windowsStartScriptGenerator.template = resources.text.fromFile("${projectDir}/besu/src/main/scripts/windowsStartScript.txt")
doLast {
tweakStartScript(startScripts)
}
doLast { tweakStartScript(startScripts) }
}
task evmToolStartScripts(type: CreateStartScripts) {
@@ -535,9 +529,7 @@ task evmToolStartScripts(type: CreateStartScripts) {
]
unixStartScriptGenerator.template = resources.text.fromFile("${projectDir}/besu/src/main/scripts/unixStartScript.txt")
windowsStartScriptGenerator.template = resources.text.fromFile("${projectDir}/besu/src/main/scripts/windowsStartScript.txt")
doLast {
tweakStartScript(evmToolStartScripts)
}
doLast { tweakStartScript(evmToolStartScripts) }
}
task autocomplete(type: JavaExec) {
@@ -583,9 +575,7 @@ publishing {
version = project.version
artifactId = 'besu'
artifact("$buildDir/distributions/besu-${project.version}.zip")
artifact("$buildDir/distributions/besu-${project.version}.tar.gz") {
extension = 'tar.gz'
}
artifact("$buildDir/distributions/besu-${project.version}.tar.gz") { extension = 'tar.gz' }
}
}
}
@@ -754,9 +744,7 @@ task dockerUpload {
exec {
def archVariantImage = "${variantImage}-${architecture}"
def cmd = "docker tag '${variantImage}' '${archVariantImage}' && docker push '${archVariantImage}'"
additionalTags.each { tag ->
cmd += " && docker tag '${variantImage}' '${dockerImage}:${tag.trim()}-${variant}-${architecture}' && docker push '${dockerImage}:${tag.trim()}-${variant}-${architecture}'"
}
additionalTags.each { tag -> cmd += " && docker tag '${variantImage}' '${dockerImage}:${tag.trim()}-${variant}-${architecture}' && docker push '${dockerImage}:${tag.trim()}-${variant}-${architecture}'" }
executable "sh"
args "-c", cmd
}
@@ -765,9 +753,7 @@ task dockerUpload {
exec {
def archImage = "${image}-${architecture}"
def cmd = "docker tag ${image} ${archImage} && docker push '${archImage}'"
additionalTags.each { tag ->
cmd += " && docker tag '${image}' '${dockerImage}:${tag.trim()}-${architecture}' && docker push '${dockerImage}:${tag.trim()}-${architecture}'"
}
additionalTags.each { tag -> cmd += " && docker tag '${image}' '${dockerImage}:${tag.trim()}-${architecture}' && docker push '${dockerImage}:${tag.trim()}-${architecture}'" }
executable "sh"
args "-c", cmd
}
@@ -839,9 +825,7 @@ task checkSpdxHeader(type: CheckSpdxHeader) {
task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
additionalSourceDirs.from files(subprojects.sourceSets.main.allSource.srcDirs)
sourceDirectories.from files(subprojects.sourceSets.main.allSource.srcDirs)
classDirectories.from files(subprojects.sourceSets.main.output).asFileTree.matching {
exclude 'org/hyperledger/besu/tests/acceptance/**'
}
classDirectories.from files(subprojects.sourceSets.main.output).asFileTree.matching { exclude 'org/hyperledger/besu/tests/acceptance/**' }
executionData.from fileTree(dir: '.', includes: ['**/jacoco/*.exec'])
reports {
xml.required = true

4
consensus/qbft/build.gradle
View File

@@ -34,9 +34,7 @@ sourceSets {
runtimeClasspath += main.output
srcDir file('src/reference-test/java')
}
resources {
srcDir file('src/reference-test/resources')
}
resources { srcDir file('src/reference-test/resources') }
}
}

4
crypto/build.gradle
View File

@@ -46,6 +46,4 @@ dependencies {
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
}
artifacts {
testSupportArtifacts testSupportJar
}
artifacts { testSupportArtifacts testSupportJar }

4
errorprone-checks/build.gradle
View File

@@ -68,6 +68,4 @@ tasks.withType(JavaCompile) {
]
}
javadoc {
enabled = false
}
javadoc { enabled = false }

8
ethereum/api/build.gradle
View File

@@ -27,9 +27,7 @@ jar {
}
}
configurations {
testResourceGeneration.extendsFrom testImplementation
}
configurations { testResourceGeneration.extendsFrom testImplementation }
dependencies {
api 'org.slf4j:slf4j-api'
@@ -122,9 +120,7 @@ dependencies {
integrationTestRuntimeOnly 'org.junit.jupiter:junit-jupiter'
}
artifacts {
testSupportArtifacts testSupportJar
}
artifacts { testSupportArtifacts testSupportJar }
task generateTestBlockchain() {
def srcFiles = 'src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data'

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyRpcMethodDecoratorTest.java
View File

@@ -45,7 +45,7 @@ public class MultiTenancyRpcMethodDecoratorTest {
public void delegatesWhenHasValidToken() {
final JsonObject principle = new JsonObject();
principle.put("privacyPublicKey", "ABC123");
final UserImpl user = new UserImpl(principle);
final UserImpl user = new UserImpl(principle, new JsonObject());
final JsonRpcRequestContext rpcRequestContext = new JsonRpcRequestContext(rpcRequest, user);
when(jsonRpcMethod.response(rpcRequestContext))
@@ -80,7 +80,7 @@ public class MultiTenancyRpcMethodDecoratorTest {
@Test
public void failsWhenTokenDoesNotHavePrivacyPublicKey() {
final User user = new UserImpl(new JsonObject());
final User user = new UserImpl(new JsonObject(), new JsonObject());
final JsonRpcRequestContext rpcRequestContext = new JsonRpcRequestContext(rpcRequest, user);
final MultiTenancyRpcMethodDecorator tokenRpcDecorator =
new MultiTenancyRpcMethodDecorator(jsonRpcMethod);

4
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyUserUtilTest.java
View File

@@ -35,7 +35,7 @@ public class MultiTenancyUserUtilTest {
@Test
public void noEnclavePublicKeyWhenUserWithoutEnclavePublicKeyClaimProvided() {
final JsonObject token = new JsonObject();
final Optional<User> user = Optional.of(new UserImpl(token));
final Optional<User> user = Optional.of(new UserImpl(token, new JsonObject()));
assertThat(privacyUserId(user)).isEmpty();
}
@@ -44,7 +44,7 @@ public class MultiTenancyUserUtilTest {
public void enclavePublicKeyKeyReturnedForUserWithEnclavePublicKeyClaim() {
final JsonObject principle = new JsonObject();
principle.put("privacyPublicKey", "ABC123");
final Optional<User> user = Optional.of(new UserImpl(principle));
final Optional<User> user = Optional.of(new UserImpl(principle, new JsonObject()));
assertThat(privacyUserId(user)).contains("ABC123");
}

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java
View File

@@ -56,7 +56,7 @@ public class PrivCreatePrivacyGroupTest {
private final PrivacyParameters privacyParameters = mock(PrivacyParameters.class);
private final PrivacyController privacyController = mock(PrivacyController.class);
private final User user =
new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY));
new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), new JsonObject());
private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
@Before

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroupTest.java
View File

@@ -46,7 +46,7 @@ public class PrivDeletePrivacyGroupTest {
private final PrivacyParameters privacyParameters = mock(PrivacyParameters.class);
private final PrivacyController privacyController = mock(PrivacyController.class);
private final User user =
new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY));
new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), new JsonObject());
private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
private JsonRpcRequestContext request;

3
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransactionTest.java
View File

@@ -59,7 +59,8 @@ public class PrivDistributeRawTransactionTest {
private static final String ENCLAVE_PUBLIC_KEY = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
private final User user =
new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY)) {};
new UserImpl(
new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), new JsonObject()) {};
private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
@Mock private PrivDistributeRawTransaction method;

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroupTest.java
View File

@@ -54,7 +54,7 @@ public class PrivFindPrivacyGroupTest {
private final PrivacyParameters privacyParameters = mock(PrivacyParameters.class);
private final PrivacyController privacyController = mock(PrivacyController.class);
private final User user =
new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY));
new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), new JsonObject());
private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
private JsonRpcRequestContext request;

3
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java
View File

@@ -55,7 +55,8 @@ public class PrivGetPrivateTransactionTest {
private final User user =
new UserImpl(
new JsonObject().put("privacyPublicKey", VALID_BASE64_ENCLAVE_KEY.toBase64String()));
new JsonObject().put("privacyPublicKey", VALID_BASE64_ENCLAVE_KEY.toBase64String()),
new JsonObject());
private final PrivacyIdProvider privacyIdProvider =
(user) -> VALID_BASE64_ENCLAVE_KEY.toBase64String();

3
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCountTest.java
View File

@@ -55,7 +55,8 @@ class PrivGetTransactionCountTest {
private final Address senderAddress =
Address.fromHexString("0x627306090abab3a6e1400e9345bc60c78a8bef57");
private final User user =
new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY)) {};
new UserImpl(
new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), new JsonObject()) {};
private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
@BeforeEach

3
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java
View File

@@ -67,7 +67,8 @@ public class PrivGetTransactionReceiptTest {
private final User user =
new UserImpl(
new JsonObject().put("privacyPublicKey", VALID_BASE64_ENCLAVE_KEY.toBase64String()));
new JsonObject().put("privacyPublicKey", VALID_BASE64_ENCLAVE_KEY.toBase64String()),
new JsonObject());
private final PrivacyIdProvider privacyIdProvider =
(user) -> VALID_BASE64_ENCLAVE_KEY.toBase64String();

2
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindFlexiblePrivacyGroupTest.java
View File

@@ -54,7 +54,7 @@ public class PrivxFindFlexiblePrivacyGroupTest {
private final PrivacyController privacyController = mock(PrivacyController.class);
private final User user =
new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY));
new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), new JsonObject());
private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
private JsonRpcRequestContext request;

3
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivacyApiGroupJsonRpcMethodsTest.java
View File

@@ -158,7 +158,8 @@ public class PrivacyApiGroupJsonRpcMethodsTest {
}
private User createUser(final String enclavePublicKey) {
return new UserImpl(new JsonObject().put("privacyPublicKey", enclavePublicKey)) {};
return new UserImpl(
new JsonObject().put("privacyPublicKey", enclavePublicKey), new JsonObject()) {};
}
private static class TestPrivacyApiGroupJsonRpcMethods extends PrivacyApiGroupJsonRpcMethods {

4
ethereum/evmtool/build.gradle
View File

@@ -136,9 +136,7 @@ task dockerUpload(type: Exec) {
additionalTags.add(dockerBuildVersion.split(/\./)[0..1].join('.'))
}
additionalTags.each { tag ->
cmd += " && docker tag '${image}' '${imageName}:${tag.trim()}' && docker push '${imageName}:${tag.trim()}'"
}
additionalTags.each { tag -> cmd += " && docker tag '${image}' '${imageName}:${tag.trim()}' && docker push '${imageName}:${tag.trim()}'" }
executable "sh"
args "-c", cmd
}

4
ethereum/p2p/build.gradle
View File

@@ -64,9 +64,7 @@ dependencies {
implementation 'tech.pegasys.discovery:discovery'
constraints {
implementation('com.github.jnr:jnr-posix') {
version {
require '3.1.15'
}
version { require '3.1.15' }
because '3.0.47 from web3j has issues'
}
}

2
ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java
View File

@@ -359,7 +359,7 @@ public class ECIESEncryptionEngine {
final int cThreshold = (len + outLen - 1) / outLen;
final byte[] dig = new byte[digestSize];
final byte[] C = Pack.intToBigEndian(COUNTER_START);
int counterBase = COUNTER_START & ~0xFF;
int counterBase = 0; // COUNTER_START & ~0xFF is always zero
int offset = outOff;
int length = len;

4
ethereum/rlp/build.gradle
View File

@@ -45,6 +45,4 @@ dependencies {
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
}
artifacts {
testSupportArtifacts testSupportJar
}
artifacts { testSupportArtifacts testSupportJar }

65
gradle/versions.gradle
View File

@@ -15,24 +15,28 @@
dependencyManagement {
dependencies {
dependency 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.2'
dependency 'com.github.ben-manes.caffeine:caffeine:3.0.5'
dependencySet(group:'com.fasterxml.jackson.core', version:'2.13.3') {
entry 'jackson-databind'
entry 'jackson-datatype'
entry 'jackson-datatype-jdk8'
}
dependencySet(group: 'com.github.tomakehurst', version: '2.32.0') {
dependency 'com.github.ben-manes.caffeine:caffeine:3.1.1'
dependencySet(group: 'com.github.tomakehurst', version: '2.33.2') {
entry'wiremock-jre8-standalone'
entry'wiremock-jre8'
}
dependency 'com.google.auto.service:auto-service:1.0.1'
dependencySet(group: 'com.google.dagger', version: '2.41') {
dependencySet(group: 'com.google.dagger', version: '2.42') {
entry'dagger-compiler'
entry'dagger'
}
dependencySet(group: 'com.google.errorprone', version: '2.13.1') {
dependencySet(group: 'com.google.errorprone', version: '2.14.0') {
entry 'error_prone_annotation'
entry 'error_prone_check_api'
entry 'error_prone_core'
@@ -41,21 +45,21 @@ dependencyManagement {
dependency 'com.google.guava:guava:31.1-jre'
dependency 'com.graphql-java:graphql-java:17.3'
dependency 'com.graphql-java:graphql-java:18.1'
dependency 'com.splunk.logging:splunk-library-javalogging:1.11.4'
dependency 'com.splunk.logging:splunk-library-javalogging:1.11.5'
dependency 'com.squareup.okhttp3:okhttp:4.9.3'
dependency 'com.squareup.okhttp3:okhttp:4.10.0'
dependency 'commons-codec:commons-codec:1.15'
dependency 'commons-io:commons-io:2.11.0'
dependency 'dnsjava:dnsjava:3.5.0'
dependency 'dnsjava:dnsjava:3.5.1'
dependency 'info.picocli:picocli:4.6.3'
dependencySet(group: 'io.grpc', version: '1.45.0') {
dependencySet(group: 'io.grpc', version: '1.47.0') {
entry'grpc-core'
entry'grpc-netty'
entry'grpc-stub'
@@ -64,13 +68,13 @@ dependencyManagement {
dependency 'io.jaegertracing:jaeger-client:1.8.0'
dependency 'io.jaegertracing:jaeger-proto:0.7.0'
dependency 'io.kubernetes:client-java:14.0.1'
dependency 'io.kubernetes:client-java:15.0.1'
dependency 'io.netty:netty-all:4.1.74.Final'
dependency 'io.netty:netty-all:4.1.78.Final'
dependency 'io.netty:netty-tcnative-boringssl-static:2.0.50.Final'
dependency group: 'io.netty', name: 'netty-transport-native-epoll', version:'4.1.74.Final', classifier: 'linux-x86_64'
dependency group: 'io.netty', name: 'netty-transport-native-kqueue', version:'4.1.74.Final', classifier: 'osx-x86_64'
dependency 'io.netty:netty-transport-native-unix-common:4.1.74.Final'
dependency group: 'io.netty', name: 'netty-transport-native-epoll', version:'4.1.78.Final', classifier: 'linux-x86_64'
dependency group: 'io.netty', name: 'netty-transport-native-kqueue', version:'4.1.78.Final', classifier: 'osx-x86_64'
dependency 'io.netty:netty-transport-native-unix-common:4.1.78.Final'
dependency 'io.opentelemetry:opentelemetry-api:1.6.0'
dependency 'io.opentelemetry:opentelemetry-exporter-otlp-metrics:1.6.0-alpha'
@@ -94,7 +98,6 @@ dependencyManagement {
dependency 'io.reactivex.rxjava2:rxjava:2.2.21'
dependencySet(group: 'io.vertx', version: '4.2.7') {
entry 'vertx-auth-jwt'
entry 'vertx-codegen'
@@ -110,7 +113,7 @@ dependencyManagement {
dependency 'net.consensys.services:quorum-mainnet-launcher:1.0.1'
dependency 'net.java.dev.jna:jna:5.10.0'
dependency 'net.java.dev.jna:jna:5.11.0'
dependency 'org.apache.commons:commons-compress:1.21'
dependency 'org.apache.commons:commons-text:1.9'
@@ -132,7 +135,7 @@ dependencyManagement {
dependency 'org.apache.tuweni:tuweni-toml:2.2.0'
dependency 'org.apache.tuweni:tuweni-units:2.2.0'
dependency 'org.assertj:assertj-core:3.22.0'
dependency 'org.assertj:assertj-core:3.23.1'
dependency 'org.awaitility:awaitility:4.2.0'
@@ -150,12 +153,9 @@ dependencyManagement {
dependency 'org.immutables:value-annotations:2.9.0'
dependency 'org.immutables:value:2.9.0'
dependency 'org.java-websocket:Java-WebSocket:1.5.2'
dependency 'org.java-websocket:Java-WebSocket:1.5.3'
dependency 'org.jetbrains.kotlin:kotlin-stdlib:1.6.10'
dependency 'org.jupnp:org.jupnp.support:2.6.0'
dependency 'org.jupnp:org.jupnp:2.6.0'
dependency 'org.jetbrains.kotlin:kotlin-stdlib:1.7.0'
dependency 'org.junit.jupiter:junit-jupiter:5.8.2'
dependency 'org.junit.jupiter:junit-jupiter-api:5.8.2'
@@ -165,19 +165,26 @@ dependencyManagement {
dependency 'org.junit.vintage:junit-vintage-engine:5.8.2'
dependency 'org.mockito:mockito-core:4.4.0'
dependency 'org.mockito:mockito-junit-jupiter:4.4.0'
dependencySet(group: 'org.jupnp', version:'2.6.1') {
entry 'org.jupnp.support'
entry 'org.jupnp'
}
dependencySet(group: 'org.mockito', version:'4.6.1') {
entry 'mockito-core'
entry 'mockito-junit-jupiter'
}
dependency 'org.openjdk.jmh:jmh-core:1.34'
dependency 'org.openjdk.jmh:jmh-generator-annprocess:1.34'
dependency 'org.rocksdb:rocksdbjni:6.29.5'
dependency 'org.slf4j:slf4j-api:1.7.25'
dependency 'org.slf4j:slf4j-api:1.7.36'
dependency 'org.springframework.security:spring-security-crypto:5.6.2'
dependency 'org.springframework.security:spring-security-crypto:5.7.2'
dependency 'org.testcontainers:testcontainers:1.16.3'
dependency 'org.testcontainers:testcontainers:1.17.2'
dependency 'org.web3j:abi:4.8.9'
dependency 'org.web3j:besu:4.8.9'

4
pki/build.gradle
View File

@@ -48,6 +48,4 @@ task testJar(type: Jar) {
from sourceSets.test.output
}
artifacts {
testArtifacts testJar
}
artifacts { testArtifacts testJar }

4
settings.gradle
View File

@@ -22,9 +22,7 @@ pluginManagement {
* com.github.hierynomus.license plugin. Can be removed when an
* official version with the fix is release upstream
*/
maven {
url = uri("https://raw.githubusercontent.com/ConsenSys/license-gradle-plugin-fix-artifacts/main/")
}
maven { url = uri("https://raw.githubusercontent.com/ConsenSys/license-gradle-plugin-fix-artifacts/main/") }
}
}

2
testutil/build.gradle
View File

@@ -32,7 +32,7 @@ dependencies {
implementation project(':util')
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.1'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
implementation 'com.google.guava:guava'
implementation 'com.squareup.okhttp3:okhttp'
implementation 'io.vertx:vertx-core'