Skip to content

Commit

Permalink
Updates Bouncy Castle to 1.76. This moves the dependency into the ver…
Browse files Browse the repository at this point in the history
…sion catalog and starts using the jdk18on series as Data Prepper requires Java 11 as a minimum anyway. (#3302)

Signed-off-by: David Venable <[email protected]>
  • Loading branch information
dlvenable authored Sep 6, 2023
1 parent 33e29b5 commit fc48b0e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions data-prepper-plugins/common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions data-prepper-plugins/otel-logs-source/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions data-prepper-plugins/otel-metrics-source/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions data-prepper-plugins/otel-trace-source/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit fc48b0e

Please sign in to comment.