Skip to content

Commit

Permalink
[1.3] Bump bouncycastle to 1.78.1 and kafka to 3.7.0 (opensearch-proj…
Browse files Browse the repository at this point in the history
…ect#4437)

Signed-off-by: Craig Perkins <cwperx@amazon.com>
  • Loading branch information
cwperks authored Jun 13, 2024
1 parent ee31176 commit 8b44076
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
12 changes: 8 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ ext {
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
version_tokens = opensearch_version.tokenize('-')
opensearch_build = version_tokens[0] + '.0'
kafka_version = '3.5.1'
kafka_version = '3.7.0'

if (buildVersionQualifier) {
opensearch_build += "-${buildVersionQualifier}"
Expand Down Expand Up @@ -170,7 +170,7 @@ dependencies {
implementation 'com.google.guava:guava:32.1.1-jre'
implementation 'org.greenrobot:eventbus:3.2.0'
implementation 'commons-cli:commons-cli:1.3.1'
implementation 'org.bouncycastle:bcprov-jdk15to18:1.75'
implementation 'org.bouncycastle:bcprov-jdk15to18:1.78.1'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
implementation 'org.ldaptive:ldaptive:1.2.3'
implementation 'org.apache.httpcomponents:httpclient-cache:4.5.13'
Expand Down Expand Up @@ -210,8 +210,12 @@ dependencies {
testImplementation 'com.unboundid:unboundid-ldapsdk:4.0.9'
testImplementation 'com.github.stephenc.jcip:jcip-annotations:1.0-1'
testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}"
testImplementation "org.apache.kafka:kafka-server:${kafka_version}"
testImplementation "org.apache.kafka:kafka-server-common:${kafka_version}"
testImplementation "org.apache.kafka:kafka-server-common:${kafka_version}:test"
testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}:test"
testImplementation "org.apache.kafka:kafka-clients:${kafka_version}:test"
testImplementation 'commons-validator:commons-validator:1.7'
compileOnly "org.opensearch:opensearch:${opensearch_version}"

integrationTestCompileOnly "org.opensearch:opensearch:${opensearch_version}"
Expand Down Expand Up @@ -245,8 +249,8 @@ dependencies {
integrationTestImplementation "org.apache.logging.log4j:log4j-core:2.17.1"
integrationTestImplementation "org.apache.logging.log4j:log4j-jul:2.17.1"
integrationTestImplementation 'org.hamcrest:hamcrest:2.2'
integrationTestImplementation "org.bouncycastle:bcpkix-jdk15to18:1.75"
integrationTestImplementation "org.bouncycastle:bcutil-jdk15to18:1.75"
integrationTestImplementation "org.bouncycastle:bcpkix-jdk15to18:1.78.1"
integrationTestImplementation "org.bouncycastle:bcutil-jdk15to18:1.78.1"
integrationTestImplementation('org.awaitility:awaitility:4.2.0') {
exclude(group: 'org.hamcrest', module: 'hamcrest')
}
Expand Down
5 changes: 4 additions & 1 deletion plugin-security.policy
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ grant {
permission java.security.SecurityPermission "putProviderProperty.BC";
permission java.security.SecurityPermission "insertProvider.BC";
permission java.security.SecurityPermission "removeProviderProperty.BC";
permission java.util.PropertyPermission "jdk.tls.rejectClientInitiatedRenegotiation", "write";
permission java.security.SecurityPermission "getProperty.org.bouncycastle.ec.max_f2m_field_size";
permission java.security.SecurityPermission "getProperty.org.bouncycastle.pkcs12.default";
permission java.security.SecurityPermission "getProperty.org.bouncycastle.rsa.max_size";
permission java.security.SecurityPermission "getProperty.org.bouncycastle.rsa.max_mr_tests";

permission java.lang.RuntimePermission "accessUserInformation";

Expand Down

0 comments on commit 8b44076

Please sign in to comment.