Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update GSON and JClouds #925

Closed
wants to merge 3 commits into from
Closed

Update GSON and JClouds #925

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47bba51
Try fixing S3 tests
labkey-jeckels Nov 8, 2024
9c17f8f
Force some mutual transitive dependencies of Cloud and Docker
labkey-jeckels Nov 8, 2024
3a966b1
Remove dupe
labkey-jeckels Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -331,6 +335,7 @@ allprojects {

// Force consistency for dependencies from cloud
force "joda-time:joda-time:${jodaTimeVersion}"
force "joda-time:joda-time:${jodaTimeVersion}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. I was hacking at it in the hopes of eliminating the force, but it's still needed (only one though!)


// 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}"
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.<init>(java.util.Map)'" errors
gsonVersion=2.8.9
gsonVersion=2.11.0

grpcVersion=1.67.1

Expand Down Expand Up @@ -196,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
Expand Down