diff --git a/build.gradle b/build.gradle index ab85c1039..16d6f892d 100644 --- a/build.gradle +++ b/build.gradle @@ -137,9 +137,16 @@ dependencies { [group: 'software.amazon.awssdk', name: 'cognitoidentity', version: amazonVersion], [group: 'software.amazon.awssdk', name: 'sts', version: amazonVersion], [group: 'software.amazon.awssdk', name: 's3', version: amazonVersion], - [group: 'software.amazon.awssdk', name: 'sso', version: amazonVersion] + [group: 'software.amazon.awssdk', name: 'sso', version: amazonVersion], + + // This is a transitive dependency from amazon but due to modularization changes between + // 1.20 and 1.3.0 we need to specify it here. + // This can be removed when amazon moves from 1.2.0 -> 1.3.0 and updates it's module requirements + // See https://logging.apache.org/blog/2023/12/02/apache-common-logging-1.3.0.html + [group: 'commons-logging', name: 'commons-logging', version: '1.3.0'] ) + testImplementation( [group: 'junit', name: 'junit', version: '4.13.2'], [group: 'com.sparkjava', name: 'spark-core', version: '2.9.4'], diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index fb0b4a1f3..20ea2ca08 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -43,5 +43,9 @@ requires software.amazon.awssdk.http; requires software.amazon.awssdk.utils; + // Transitive dependency of amazon modules that is required to be specified + // because amazon resolves the unmodularized 1.2.0 version while htjsdk brings in the modular 1.3.0 + requires org.apache.commons.logging; + requires jide.oss; }