From 1eadac78a467ddc54a7e4c041d59a397196c25b3 Mon Sep 17 00:00:00 2001 From: bhashinee Date: Thu, 4 Jul 2024 17:15:48 +0530 Subject: [PATCH 1/2] Update the bcpkix version --- gradle/javaLibsProject.gradle | 2 +- gradle/javaProject.gradle | 2 +- .../testerina-core/src/main/ballerina/Ballerina.toml | 2 +- stdlib/grpc/src/main/ballerina/Ballerina.toml | 6 +++--- stdlib/http/src/main/ballerina/Ballerina.toml | 6 +++--- stdlib/mime/src/main/ballerina/Ballerina.toml | 4 ++-- stdlib/websub/src/main/ballerina/Ballerina.toml | 6 +++--- tests/ballerina-test-utils/build.gradle | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gradle/javaLibsProject.gradle b/gradle/javaLibsProject.gradle index 9bc9c87097ec..ac144b0faa7f 100644 --- a/gradle/javaLibsProject.gradle +++ b/gradle/javaLibsProject.gradle @@ -41,7 +41,7 @@ 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 '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 index 2f989cda053c..27e9a830a8a9 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -76,7 +76,7 @@ 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.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 index de2ffd3b435c..ce6d98df7f31 100644 --- 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 index 5ef63864cc8f..f0c253bfa0ae 100644 --- a/stdlib/grpc/src/main/ballerina/Ballerina.toml +++ b/stdlib/grpc/src/main/ballerina/Ballerina.toml @@ -118,9 +118,9 @@ 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"] diff --git a/stdlib/http/src/main/ballerina/Ballerina.toml b/stdlib/http/src/main/ballerina/Ballerina.toml index b428932cd4f2..1ac44be88353 100644 --- a/stdlib/http/src/main/ballerina/Ballerina.toml +++ b/stdlib/http/src/main/ballerina/Ballerina.toml @@ -111,9 +111,9 @@ 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-jdk15on-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 index 1865a1ebf4a3..657464581e99 100644 --- a/stdlib/mime/src/main/ballerina/Ballerina.toml +++ b/stdlib/mime/src/main/ballerina/Ballerina.toml @@ -119,8 +119,8 @@ target = "java8" [[platform.libraries]] artifactId = "bcpkix-jdk15on" - version = "1.70" - path = "./lib/bcpkix-jdk15on-1.70.jar" + version = "1.78" + path = "./lib/bcpkix-jdk15on-1.78.jar" groupId = "org.bouncycastle" modules = ["mime"] diff --git a/stdlib/websub/src/main/ballerina/Ballerina.toml b/stdlib/websub/src/main/ballerina/Ballerina.toml index 5ba62780509f..e408acad2e07 100644 --- a/stdlib/websub/src/main/ballerina/Ballerina.toml +++ b/stdlib/websub/src/main/ballerina/Ballerina.toml @@ -111,9 +111,9 @@ 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-jdk15on-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 index 646443f49412..423ae20d1384 100644 --- a/tests/ballerina-test-utils/build.gradle +++ b/tests/ballerina-test-utils/build.gradle @@ -81,7 +81,7 @@ 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('io.netty:netty-tcnative-boringssl-static')) exclude(dependency('org.testng:testng')) exclude(dependency('com.beust:jcommander')) From 2f5224974f707ca69749faec47ff29d47f2fe016 Mon Sep 17 00:00:00 2001 From: bhashinee Date: Fri, 5 Jul 2024 08:23:53 +0530 Subject: [PATCH 2/2] Add the bcutil dependency --- gradle/javaLibsProject.gradle | 1 + gradle/javaProject.gradle | 1 + stdlib/grpc/src/main/ballerina/Ballerina.toml | 7 +++++++ stdlib/http/build.gradle | 3 ++- stdlib/http/src/main/ballerina/Ballerina.toml | 9 ++++++++- stdlib/mime/src/main/ballerina/Ballerina.toml | 13 ++++++++++--- stdlib/websub/src/main/ballerina/Ballerina.toml | 9 ++++++++- tests/ballerina-test-utils/build.gradle | 1 + 8 files changed, 38 insertions(+), 6 deletions(-) diff --git a/gradle/javaLibsProject.gradle b/gradle/javaLibsProject.gradle index ac144b0faa7f..2960e9e89ef1 100644 --- a/gradle/javaLibsProject.gradle +++ b/gradle/javaLibsProject.gradle @@ -42,6 +42,7 @@ dependencies { 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-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 index 27e9a830a8a9..ca7a6db1b043 100644 --- a/gradle/javaProject.gradle +++ b/gradle/javaProject.gradle @@ -77,6 +77,7 @@ dependencies { implementation 'org.apache.thrift:libthrift:0.14.1' implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1' 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/stdlib/grpc/src/main/ballerina/Ballerina.toml b/stdlib/grpc/src/main/ballerina/Ballerina.toml index f0c253bfa0ae..fcd575a09400 100644 --- a/stdlib/grpc/src/main/ballerina/Ballerina.toml +++ b/stdlib/grpc/src/main/ballerina/Ballerina.toml @@ -123,6 +123,13 @@ target = "java8" 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"] [[platform.libraries]] artifactId = "netty-tcnative-classes" diff --git a/stdlib/http/build.gradle b/stdlib/http/build.gradle index 76edb5ad400e..25e61f05a077 100644 --- 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 index 1ac44be88353..c892952fae5c 100644 --- a/stdlib/http/src/main/ballerina/Ballerina.toml +++ b/stdlib/http/src/main/ballerina/Ballerina.toml @@ -113,7 +113,14 @@ target = "java8" [[platform.libraries]] artifactId = "bcpkix-jdk18on" version = "1.78.1" - path = "./lib/bcpkix-jdk15on-1.78.1.jar" + 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 index 657464581e99..29694a756668 100644 --- 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.78" - path = "./lib/bcpkix-jdk15on-1.78.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 index e408acad2e07..0405b1733c64 100644 --- a/stdlib/websub/src/main/ballerina/Ballerina.toml +++ b/stdlib/websub/src/main/ballerina/Ballerina.toml @@ -113,7 +113,14 @@ target = "java8" [[platform.libraries]] artifactId = "bcpkix-jdk18on" version = "1.78.1" - path = "./lib/bcpkix-jdk15on-1.78.1.jar" + 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 index 423ae20d1384..09c24073f510 100644 --- a/tests/ballerina-test-utils/build.gradle +++ b/tests/ballerina-test-utils/build.gradle @@ -82,6 +82,7 @@ shadowJar { exclude(dependency('org.yaml:snakeyaml')) exclude(dependency('org.bouncycastle:bcprov-jdk18on')) 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'))