From 22817360909b57f05f2e98238a38958464ad7c7a Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Thu, 7 Sep 2023 13:57:29 +0530 Subject: [PATCH 1/2] Update BC version --- ballerina/build.gradle | 4 ++-- build-config/resources/Ballerina.toml | 8 ++++---- gradle.properties | 2 +- native/build.gradle | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ballerina/build.gradle b/ballerina/build.gradle index a4125315cd..289c4f10b5 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -110,10 +110,10 @@ dependencies { externalJars(group: 'commons-pool.wso2', name: 'commons-pool', version: "${wso2CommonsPoolVersion}") { transitive = false } - externalJars(group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: "${bouncycastleVersion}") { + externalJars(group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: "${bouncycastleVersion}") { transitive = false } - externalJars(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: "${bouncycastleVersion}") { + externalJars(group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: "${bouncycastleVersion}") { transitive = false } externalJars(group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: "${nettyTcnativeVersion}") { diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index b9b8622a6a..d9b9b7f1ec 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -95,15 +95,15 @@ path = "./lib/netty-transport-native-unix-common-@netty.version@.jar" [[platform.java11.dependency]] groupId = "org.bouncycastle" -artifactId = "bcprov-jdk15on" +artifactId = "bcprov-jdk18on" version = "@bouncycastle.version@" -path = "./lib/bcprov-jdk15on-@bouncycastle.version@.jar" +path = "./lib/bcprov-jdk18on-@bouncycastle.version@.jar" [[platform.java11.dependency]] groupId = "org.bouncycastle" -artifactId = "bcpkix-jdk15on" +artifactId = "bcpkix-jdk18on" version = "@bouncycastle.version@" -path = "./lib/bcpkix-jdk15on-@bouncycastle.version@.jar" +path = "./lib/bcpkix-jdk18on-@bouncycastle.version@.jar" [[platform.java11.dependency]] groupId = "io.netty" diff --git a/gradle.properties b/gradle.properties index 6c8e5b8034..3090e97352 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ ballerinaTomlParserVersion=1.2.2 commonsLang3Version=3.8.1 nettyVersion=4.1.94.Final nettyTcnativeVersion=2.0.61.Final -bouncycastleVersion=1.69 +bouncycastleVersion=1.74 slf4jVersion=1.7.30 jakartaXmlBindVersion=2.3.3 wso2CommonsPoolVersion=1.5.6.wso2v1 diff --git a/native/build.gradle b/native/build.gradle index 13761dccf9..ef1fcec805 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -61,8 +61,8 @@ dependencies { implementation group: 'org.wso2.eclipse.osgi', name: 'org.eclipse.osgi', version:"${wso2EclipseOsgiVersion}" implementation group: 'commons-pool.wso2', name: 'commons-pool', version:"${wso2CommonsPoolVersion}" - implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: "${bouncycastleVersion}" - implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: "${bouncycastleVersion}" + implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: "${bouncycastleVersion}" + implementation group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: "${bouncycastleVersion}" implementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: "${jakartaXmlBindVersion}" testImplementation group: 'org.mock-server', name: 'mockserver-netty', version:"${mockserverNettyVersion}" From d21ebcfc69113ba9b6dc94856a741cc37ab2fa9b Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Thu, 7 Sep 2023 13:59:17 +0530 Subject: [PATCH 2/2] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 18 +++++++++--------- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index b98d5d895e..c6f8dee416 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "http" -version = "2.8.1" +version = "2.8.2" authors = ["Ballerina"] keywords = ["http", "network", "service", "listener", "client"] repository = "https://github.com/ballerina-platform/module-ballerina-http" @@ -12,8 +12,8 @@ distribution = "2201.5.0" [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" artifactId = "http-native" -version = "2.8.1" -path = "../native/build/libs/http-native-2.8.1.jar" +version = "2.8.2" +path = "../native/build/libs/http-native-2.8.2-SNAPSHOT.jar" [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" @@ -95,15 +95,15 @@ path = "./lib/netty-transport-native-unix-common-4.1.94.Final.jar" [[platform.java11.dependency]] groupId = "org.bouncycastle" -artifactId = "bcprov-jdk15on" -version = "1.69" -path = "./lib/bcprov-jdk15on-1.69.jar" +artifactId = "bcprov-jdk18on" +version = "1.74" +path = "./lib/bcprov-jdk18on-1.74.jar" [[platform.java11.dependency]] groupId = "org.bouncycastle" -artifactId = "bcpkix-jdk15on" -version = "1.69" -path = "./lib/bcpkix-jdk15on-1.69.jar" +artifactId = "bcpkix-jdk18on" +version = "1.74" +path = "./lib/bcpkix-jdk18on-1.74.jar" [[platform.java11.dependency]] groupId = "io.netty" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index 31593244c4..14015c78a0 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "http-compiler-plugin" class = "io.ballerina.stdlib.http.compiler.HttpCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/http-compiler-plugin-2.8.1.jar" +path = "../compiler-plugin/build/libs/http-compiler-plugin-2.8.2-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index a4134ac285..70390f6580 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -76,7 +76,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.8.1" +version = "2.8.2" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"},