Skip to content

Commit

Permalink
Fix for Amazon failing.
Browse files Browse the repository at this point in the history
* Fix the amazon failures due to LogFactory not found by adding a module dependency
* on apache logging.  This is necessary because commons-logging became modularized
* between 1.2.0 and 1.3.0 but amazon is expecting the non-modular 1.2.0 while
* 1.3.0 is being brought in due to changes in htsjdk.
* See https://logging.apache.org/blog/2023/12/02/apache-common-logging-1.3.0.html for
* more info.
* Fix for #1598
  • Loading branch information
lbergelson committed Oct 11, 2024
1 parent 15e8c2a commit cb6af02
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
9 changes: 8 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

0 comments on commit cb6af02

Please sign in to comment.