From 06095d91cb4754d93f52d1ed7e194ed5d85fda37 Mon Sep 17 00:00:00 2001 From: Sicheng Song Date: Wed, 6 Sep 2023 17:40:52 +0000 Subject: [PATCH 1/3] fix commons-lang3 package version to fix jarhell issue Signed-off-by: Sicheng Song --- plugin/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/build.gradle b/plugin/build.gradle index d574e92b14..f40eb5592e 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -56,7 +56,7 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}") implementation group: 'com.google.guava', name: 'guava', version: '32.0.1-jre' implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1' - implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: "${versions.commonslang}" implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1' implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0' implementation "org.apache.logging.log4j:log4j-slf4j-impl:2.19.0" @@ -322,7 +322,7 @@ jacocoTestCoverageVerification { check.dependsOn jacocoTestCoverageVerification configurations.all { - resolutionStrategy.force 'org.apache.commons:commons-lang3:3.10' + resolutionStrategy.force 'org.apache.commons:commons-lang3:"${versions.commonslang}"' resolutionStrategy.force 'commons-logging:commons-logging:1.2' resolutionStrategy.force 'org.objenesis:objenesis:3.2' resolutionStrategy.force 'net.java.dev.jna:jna:5.11.0' From d18ae6d7bb97bafe22fda7d18e0be6042d303b80 Mon Sep 17 00:00:00 2001 From: Sicheng Song Date: Wed, 6 Sep 2023 17:52:13 +0000 Subject: [PATCH 2/3] fix commons-lang3 package version Signed-off-by: Sicheng Song --- plugin/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/build.gradle b/plugin/build.gradle index f40eb5592e..060cc1b407 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -322,7 +322,7 @@ jacocoTestCoverageVerification { check.dependsOn jacocoTestCoverageVerification configurations.all { - resolutionStrategy.force 'org.apache.commons:commons-lang3:"${versions.commonslang}"' + resolutionStrategy.force 'org.apache.commons:commons-lang3:3.13.0' resolutionStrategy.force 'commons-logging:commons-logging:1.2' resolutionStrategy.force 'org.objenesis:objenesis:3.2' resolutionStrategy.force 'net.java.dev.jna:jna:5.11.0' From 6cdab70b59b86ef844a69fcdd723d8e46aae3913 Mon Sep 17 00:00:00 2001 From: Sicheng Song Date: Wed, 6 Sep 2023 22:17:26 +0000 Subject: [PATCH 3/3] fix aws-encryption-sdk jarhell Signed-off-by: Sicheng Song --- plugin/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/build.gradle b/plugin/build.gradle index 060cc1b407..15dbac332b 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -189,7 +189,7 @@ integTest { } testClusters.integTest { - testDistribution = "ARCHIVE" + testDistribution = "INTEG_TEST" // Cluster shrink exception thrown if we try to set numberOfNodes to 1, so only apply if > 1 if (_numNodes > 1) numberOfNodes = _numNodes // When running integration tests it doesn't forward the --debug-jvm to the cluster anymore