Skip to content

Commit

Permalink
Updates Bouncy Castle to 1.78.1. Update any projects that attempt to …
Browse files Browse the repository at this point in the history
…use Bouncy Castle jdk15on dependencies with the jdk18on dependency instead. This will prevent any of the older jdk15on dependencies from getting into our classpath. In particular, this was coming from hadoop-common. (#4871)

Signed-off-by: David Venable <dlv@amazon.com>
(cherry picked from commit 0a26f59)
  • Loading branch information
dlvenable authored and github-actions[bot] committed Aug 26, 2024
1 parent 7a4d47f commit 7663b67
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,10 @@ subprojects {
}
} else if (details.requested.group == 'log4j' && details.requested.name == 'log4j') {
details.useTarget group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: '2.17.1'
} else if (details.requested.group == 'org.bouncycastle' && details.requested.name.endsWith('-jdk15on')) {
def java8Name = details.requested.name.replace('-jdk15on', '-jdk18on')
details.useTarget group: 'org.bouncycastle', name: java8Name, version: libs.bouncycastle.bcprov.get().version
details.because 'Use only the Java 8 artifacts of BouncyCastle'
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencyResolutionManagement {
version('spring', '5.3.28')
library('spring-core', 'org.springframework', 'spring-core').versionRef('spring')
library('spring-context', 'org.springframework', 'spring-context').versionRef('spring')
version('bouncycastle', '1.76')
version('bouncycastle', '1.78.1')
library('bouncycastle-bcprov', 'org.bouncycastle', 'bcprov-jdk18on').versionRef('bouncycastle')
library('bouncycastle-bcpkix', 'org.bouncycastle', 'bcpkix-jdk18on').versionRef('bouncycastle')
version('guava', '32.1.2-jre')
Expand Down

0 comments on commit 7663b67

Please sign in to comment.