From 47bba51fc67dfc10704b759c5a2aa3657d178104 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Thu, 7 Nov 2024 16:27:41 -0800 Subject: [PATCH 1/3] Try fixing S3 tests --- gradle.properties | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4a7268ed28..e61625a7c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -162,10 +162,7 @@ googleProtocolBufVersion=3.25.5 graalVersion=24.1.1 # Cloud and SequenceAnalysis bring gson in as a transitive dependency. -# We resolve to the later version here to keep things consistent -# Note: Current jclouds seems to require 2.8.9; attempting to upgrade to 2.9.0 cratered the S3 test suite with many -# "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.(java.util.Map)'" errors -gsonVersion=2.8.9 +gsonVersion=2.11.0 grpcVersion=1.67.1 From 9c17f8f6e5ad7ae37f6ef5e897b82ab840c4fd2f Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Fri, 8 Nov 2024 13:47:18 -0800 Subject: [PATCH 2/3] Force some mutual transitive dependencies of Cloud and Docker --- build.gradle | 5 +++++ gradle.properties | 3 +++ 2 files changed, 8 insertions(+) diff --git a/build.gradle b/build.gradle index f22c96926d..471c6c5866 100644 --- a/build.gradle +++ b/build.gradle @@ -243,6 +243,10 @@ allprojects { // cloud and SequenceAnalysis bring this in as a transitive dependency. We resolve to the later version here to keep things consistent force "com.google.code.gson:gson:${gsonVersion}" + // docker and cloud bring in different versions + force "jakarta.ws.rs:jakarta.ws.rs-api:${jakartaWsRsApiVersion}" + force "jakarta.annotation:jakarta.annotation-api:${jakartaWsAnnotationApiVersion}" + // Google oauth2-http Library and api-common (via Picard, and perhaps others) bring in different versions; force the latest force "com.google.auto.value:auto-value-annotations:${googleAutoValueAnnotationsVersion}" force "com.google.http-client:google-http-client-apache-v2:${googleHttpClientVersion}" @@ -331,6 +335,7 @@ allprojects { // Force consistency for dependencies from cloud force "joda-time:joda-time:${jodaTimeVersion}" + force "joda-time:joda-time:${jodaTimeVersion}" // Force latest hadoop-hdfs-client for CVE-2021-37404, CVE-2022-25168, CVE-2022-26612, CVE-2021-25642, CVE-2021-33036, CVE-2023-26031 force "org.apache.hadoop:hadoop-hdfs-client:${hadoopHdfsClientVersion}" diff --git a/gradle.properties b/gradle.properties index e61625a7c0..74c2e5e2b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -193,6 +193,9 @@ jacksonAnnotationsVersion=2.18.0 jacksonDatabindVersion=2.18.0 jacksonJaxrsBaseVersion=2.18.0 +jakartaWsRsApiVersion=3.0.0 +jakartaWsAnnotationApiVersion=2.0.0 + jamaVersion=1.0.3 javassistVersion=3.20.0-GA From 3a966b122a48809ddb00368834f65ded1ebe53e5 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Fri, 8 Nov 2024 14:24:05 -0800 Subject: [PATCH 3/3] Remove dupe --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 471c6c5866..01d6304453 100644 --- a/build.gradle +++ b/build.gradle @@ -335,7 +335,6 @@ allprojects { // Force consistency for dependencies from cloud force "joda-time:joda-time:${jodaTimeVersion}" - force "joda-time:joda-time:${jodaTimeVersion}" // Force latest hadoop-hdfs-client for CVE-2021-37404, CVE-2022-25168, CVE-2022-26612, CVE-2021-25642, CVE-2021-33036, CVE-2023-26031 force "org.apache.hadoop:hadoop-hdfs-client:${hadoopHdfsClientVersion}"