Merge pull request #43046 from Bhashinee/v1.2.x

Update the bcpkix version
ballerina-platform · Jul 5, 2024 · 9cb31cb · 9cb31cb
2 parents d2eb869 + 2f52249
commit 9cb31cb
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 17 deletions.
diff --git a/gradle/javaLibsProject.gradle b/gradle/javaLibsProject.gradle
@@ -41,7 +41,8 @@ dependencies {
     dist 'org.wso2.transport.file:org.wso2.transport.local-file-system:6.0.55'
     dist 'org.wso2.transport.http:org.wso2.transport.http.netty:6.3.51'
     dist 'org.bouncycastle:bcprov-jdk18on:1.78.1'
-    dist 'org.bouncycastle:bcpkix-jdk15on:1.70'
+    dist 'org.bouncycastle:bcpkix-jdk18on:1.78.1'
+    dist 'org.bouncycastle:bcutil-jdk18on:1.78.1'
 
     dist 'info.picocli:picocli:4.0.1'
     dist 'org.apache.kafka:kafka-clients:2.8.2'

diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle
@@ -76,7 +76,8 @@ dependencies {
         implementation 'org.awaitility:awaitility:3.1.6'
         implementation 'org.apache.thrift:libthrift:0.14.1'
         implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'
-        implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
+        implementation 'org.bouncycastle:bcpkix-jdk18on:1.78.1'
+        implementation 'org.bouncycastle:bcutil-jdk18on:1.78.1'
         implementation 'org.bytedeco.javacpp-presets:llvm-platform:6.0.1-1.4.2'
         implementation 'org.codehaus.plexus:plexus-utils:3.0.8'
         implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.8.1'

diff --git a/misc/testerina/modules/testerina-core/src/main/ballerina/Ballerina.toml b/misc/testerina/modules/testerina-core/src/main/ballerina/Ballerina.toml
@@ -8,5 +8,5 @@ target = "java8"
     [[platform.libraries]]
         artifactId = "mock"
         version = "0.0.0"
-        path = "./lib/testerina-core-1.2.51.jar"
+        path = "./lib/testerina-core-1.2.52.jar"
         groupId = "ballerina"
diff --git a/stdlib/grpc/src/main/ballerina/Ballerina.toml b/stdlib/grpc/src/main/ballerina/Ballerina.toml
@@ -118,9 +118,16 @@ target = "java8"
     modules = ["grpc"]
 
     [[platform.libraries]]
-    artifactId = "bcpkix-jdk15on"
-    version = "1.70"
-    path = "./lib/bcpkix-jdk15on-1.70.jar"
+    artifactId = "bcpkix-jdk18on"
+    version = "1.78.1"
+    path = "./lib/bcpkix-jdk18on-1.78.1.jar"
+    groupId = "org.bouncycastle"
+    modules = ["grpc"]
+
+    [[platform.libraries]]
+    artifactId = "bcutil-jdk18on"
+    version = "1.78.1"
+    path = "./lib/bcutil-jdk18on-1.78.1.jar"
     groupId = "org.bouncycastle"
     modules = ["grpc"]
 

diff --git a/stdlib/http/build.gradle b/stdlib/http/build.gradle
@@ -95,7 +95,8 @@ dependencies {
     implementation 'org.apache.commons:commons-lang3'
     implementation 'org.jvnet.mimepull:mimepull'
     implementation 'org.bouncycastle:bcprov-jdk18on'
-    implementation 'org.bouncycastle:bcpkix-jdk15on'
+    implementation 'org.bouncycastle:bcpkix-jdk18on'
+    implementation 'org.bouncycastle:bcutil-jdk18on'
     testCompile project(path: ':ballerina-mime', configuration: 'tests')
     testCompile project(path: ':ballerina-test-common', configuration: 'tests')
     testCompile project(path: ':ballerina-test-utils', configuration: 'shadow')

diff --git a/stdlib/http/src/main/ballerina/Ballerina.toml b/stdlib/http/src/main/ballerina/Ballerina.toml
@@ -111,9 +111,16 @@ target = "java8"
     modules = ["http"]
 
     [[platform.libraries]]
-    artifactId = "bcpkix-jdk15on"
-    version = "1.70"
-    path = "./lib/bcpkix-jdk15on-1.70.jar"
+    artifactId = "bcpkix-jdk18on"
+    version = "1.78.1"
+    path = "./lib/bcpkix-jdk18on-1.78.1.jar"
+    groupId = "org.bouncycastle"
+    modules = ["http"]
+
+    [[platform.libraries]]
+    artifactId = "bcutil-jdk18on"
+    version = "1.78.1"
+    path = "./lib/bcutil-jdk18on-1.78.1.jar"
     groupId = "org.bouncycastle"
     modules = ["http"]
 

diff --git a/stdlib/mime/src/main/ballerina/Ballerina.toml b/stdlib/mime/src/main/ballerina/Ballerina.toml
@@ -118,9 +118,16 @@ target = "java8"
     modules = ["mime"]
 
     [[platform.libraries]]
-    artifactId = "bcpkix-jdk15on"
-    version = "1.70"
-    path = "./lib/bcpkix-jdk15on-1.70.jar"
+    artifactId = "bcutil-jdk18on"
+    version = "1.78.1"
+    path = "./lib/bcutil-jdk18on-1.78.1.jar"
+    groupId = "org.bouncycastle"
+    modules = ["mime"]
+
+    [[platform.libraries]]
+    artifactId = "bcpkix-jdk18on"
+    version = "1.78.1"
+    path = "./lib/bcpkix-jdk18on-1.78.1.jar"
     groupId = "org.bouncycastle"
     modules = ["mime"]
 

diff --git a/stdlib/websub/src/main/ballerina/Ballerina.toml b/stdlib/websub/src/main/ballerina/Ballerina.toml
@@ -111,9 +111,16 @@ target = "java8"
     modules = ["web-sub"]
 
     [[platform.libraries]]
-    artifactId = "bcpkix-jdk15on"
-    version = "1.70"
-    path = "./lib/bcpkix-jdk15on-1.70.jar"
+    artifactId = "bcpkix-jdk18on"
+    version = "1.78.1"
+    path = "./lib/bcpkix-jdk18on-1.78.1.jar"
+    groupId = "org.bouncycastle"
+    modules = ["web-sub"]
+
+    [[platform.libraries]]
+    artifactId = "bcutil-jdk18on"
+    version = "1.78.1"
+    path = "./lib/bcutil-jdk18on-1.78.1.jar"
     groupId = "org.bouncycastle"
     modules = ["web-sub"]
 

diff --git a/tests/ballerina-test-utils/build.gradle b/tests/ballerina-test-utils/build.gradle
@@ -81,7 +81,8 @@ shadowJar {
         exclude(dependency('commons-pool:commons-pool'))
         exclude(dependency('org.yaml:snakeyaml'))
         exclude(dependency('org.bouncycastle:bcprov-jdk18on'))
-        exclude(dependency('org.bouncycastle:bcpkix-jdk15on'))
+        exclude(dependency('org.bouncycastle:bcpkix-jdk18on'))
+        exclude(dependency('org.bouncycastle:bcutil-jdk18on'))
         exclude(dependency('io.netty:netty-tcnative-boringssl-static'))
         exclude(dependency('org.testng:testng'))
         exclude(dependency('com.beust:jcommander'))