Updates Bouncy Castle to 1.76. This moves the dependency into the ver…

…sion catalog and starts using the jdk18on series as Data Prepper requires Java 11 as a minimum anyway. (#3302) (#3307) Signed-off-by: David Venable <[email protected]> (cherry picked from commit fc48b0e) Co-authored-by: David Venable <[email protected]>
opensearch-project · Sep 8, 2023 · ad15f71 · ad15f71
1 parent be948eb
commit ad15f71
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/data-prepper-plugins/common/build.gradle b/data-prepper-plugins/common/build.gradle
@@ -15,8 +15,8 @@ dependencies {
     implementation 'software.amazon.awssdk:acm'
     implementation 'org.apache.commons:commons-compress:1.23.0'
     implementation libs.commons.lang3
-    implementation "org.bouncycastle:bcprov-jdk15on:1.70"
-    implementation "org.bouncycastle:bcpkix-jdk15on:1.70"
+    implementation libs.bouncycastle.bcprov
+    implementation libs.bouncycastle.bcpkix
     implementation 'org.reflections:reflections:0.10.2'
     implementation 'io.micrometer:micrometer-core'
     testImplementation testLibs.junit.vintage

diff --git a/data-prepper-plugins/otel-logs-source/build.gradle b/data-prepper-plugins/otel-logs-source/build.gradle
@@ -27,8 +27,8 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
     implementation libs.commons.lang3
-    implementation "org.bouncycastle:bcprov-jdk15on:1.69"
-    implementation "org.bouncycastle:bcpkix-jdk15on:1.69"
+    implementation libs.bouncycastle.bcprov
+    implementation libs.bouncycastle.bcpkix
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation testLibs.mockito.inline
     testImplementation("commons-io:commons-io:2.10.0")

diff --git a/data-prepper-plugins/otel-metrics-source/build.gradle b/data-prepper-plugins/otel-metrics-source/build.gradle
@@ -26,8 +26,8 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
     implementation libs.commons.lang3
-    implementation "org.bouncycastle:bcprov-jdk15on:1.70"
-    implementation "org.bouncycastle:bcpkix-jdk15on:1.70"
+    implementation libs.bouncycastle.bcprov
+    implementation libs.bouncycastle.bcpkix
     testImplementation testLibs.junit.vintage
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation testLibs.mockito.inline

diff --git a/data-prepper-plugins/otel-trace-source/build.gradle b/data-prepper-plugins/otel-trace-source/build.gradle
@@ -25,8 +25,8 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
     implementation libs.commons.lang3
-    implementation "org.bouncycastle:bcprov-jdk15on:1.70"
-    implementation "org.bouncycastle:bcpkix-jdk15on:1.70"
+    implementation libs.bouncycastle.bcprov
+    implementation libs.bouncycastle.bcpkix
     testImplementation testLibs.junit.vintage
     testImplementation 'org.assertj:assertj-core:3.24.2'
     testImplementation testLibs.mockito.inline

diff --git a/settings.gradle b/settings.gradle
@@ -34,6 +34,9 @@ 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')
+            library('bouncycastle-bcprov', 'org.bouncycastle', 'bcprov-jdk18on').versionRef('bouncycastle')
+            library('bouncycastle-bcpkix', 'org.bouncycastle', 'bcpkix-jdk18on').versionRef('bouncycastle')
             version('guava', '32.0.1-jre')
             library('guava-core', 'com.google.guava', 'guava').versionRef('guava')
             library('commons-lang3', 'org.apache.commons', 'commons-lang3').version('3.13.0')