From fc48b0e013a0e68c62803711322b9e4d9d2eba03 Mon Sep 17 00:00:00 2001 From: David Venable Date: Wed, 6 Sep 2023 06:42:52 -0700 Subject: [PATCH] Updates Bouncy Castle to 1.76. This moves the dependency into the version catalog and starts using the jdk18on series as Data Prepper requires Java 11 as a minimum anyway. (#3302) Signed-off-by: David Venable --- data-prepper-plugins/common/build.gradle | 4 ++-- data-prepper-plugins/otel-logs-source/build.gradle | 4 ++-- data-prepper-plugins/otel-metrics-source/build.gradle | 4 ++-- data-prepper-plugins/otel-trace-source/build.gradle | 4 ++-- settings.gradle | 3 +++ 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/data-prepper-plugins/common/build.gradle b/data-prepper-plugins/common/build.gradle index 6ec3272bd4..1d64b0c66d 100644 --- 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 index de1900539d..45e67098e9 100644 --- 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 index d22e42968e..59591e66d4 100644 --- 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 index a037076e27..ca39952cca 100644 --- 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 index bbbcfb471c..43a1c5c7e6 100644 --- 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')