Skip to content

Commit

Permalink
Force some mutual transitive dependencies of Cloud and Docker
Browse files Browse the repository at this point in the history
  • Loading branch information
labkey-jeckels committed Nov 8, 2024
1 parent 47bba51 commit 9c17f8f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
5 changes: 5 additions & 0 deletions build.gradle
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}"

// 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
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9c17f8f

Please sign in to comment.