From 8220baafe82d0e822c7f99a1237972171723e1e7 Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Thu, 7 Sep 2023 13:29:41 +0530 Subject: [PATCH 1/5] Update BC version --- ballerina/build.gradle | 4 ++-- build-config/resources/Ballerina.toml | 4 ++-- gradle.properties | 2 +- native/build.gradle | 4 ++-- 4 files changed, 7 insertions(+), 7 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 97f72e376b..3b23657e68 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -99,13 +99,13 @@ 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" [[platform.java11.dependency]] groupId = "org.bouncycastle" -artifactId = "bcpkix-jdk15on" +artifactId = "bcpkix-jdk18on" version = "@bouncycastle.version@" path = "./lib/bcpkix-jdk15on-@bouncycastle.version@.jar" diff --git a/gradle.properties b/gradle.properties index 2b11457661..91675cd7be 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 5d05ba7bae674549ccb7e310a786b78c731ac7e0 Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Thu, 7 Sep 2023 13:33:03 +0530 Subject: [PATCH 2/5] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 18 +++++++++--------- ballerina/CompilerPlugin.toml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 300e9e3f22..4d180dba34 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "http" -version = "2.9.2" +version = "2.9.3" authors = ["Ballerina"] keywords = ["http", "network", "service", "listener", "client"] repository = "https://github.com/ballerina-platform/module-ballerina-http" @@ -16,8 +16,8 @@ graalvmCompatible = true [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" artifactId = "http-native" -version = "2.9.2" -path = "../native/build/libs/http-native-2.9.2.jar" +version = "2.9.3" +path = "../native/build/libs/http-native-2.9.3-SNAPSHOT.jar" [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" @@ -99,15 +99,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-jdk15on-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-jdk15on-1.74.jar" [[platform.java11.dependency]] groupId = "io.netty" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index 4bd327eec0..9493861875 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.9.2.jar" +path = "../compiler-plugin/build/libs/http-compiler-plugin-2.9.3-SNAPSHOT.jar" From f0fa02206da7b51be29960e2bc326b1312fdd589 Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Thu, 7 Sep 2023 13:34:03 +0530 Subject: [PATCH 3/5] Update JAR file path --- build-config/resources/Ballerina.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 3b23657e68..51705e4a20 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -101,13 +101,13 @@ path = "./lib/netty-transport-native-unix-common-@netty.version@.jar" groupId = "org.bouncycastle" 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-jdk18on" version = "@bouncycastle.version@" -path = "./lib/bcpkix-jdk15on-@bouncycastle.version@.jar" +path = "./lib/bcpkix-jdk18on-@bouncycastle.version@.jar" [[platform.java11.dependency]] groupId = "io.netty" From f02b41586e4b04c29e37866be299164730aaab6c Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Thu, 7 Sep 2023 13:34:23 +0530 Subject: [PATCH 4/5] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 4 ++-- ballerina/Dependencies.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 4d180dba34..caf9a95f0a 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -101,13 +101,13 @@ path = "./lib/netty-transport-native-unix-common-4.1.94.Final.jar" groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" version = "1.74" -path = "./lib/bcprov-jdk15on-1.74.jar" +path = "./lib/bcprov-jdk18on-1.74.jar" [[platform.java11.dependency]] groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" version = "1.74" -path = "./lib/bcpkix-jdk15on-1.74.jar" +path = "./lib/bcpkix-jdk18on-1.74.jar" [[platform.java11.dependency]] groupId = "io.netty" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 9ebf5bfae5..51629790ca 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -76,7 +76,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.9.2" +version = "2.9.3" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, From bcdbb9786d8be42ce775694d7ecc5dd4443ed763 Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Thu, 7 Sep 2023 14:42:48 +0530 Subject: [PATCH 5/5] Fix workflow issue --- .github/workflows/build-with-bal-test-graalvm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml index 3d25ebb035..bfa0f715ee 100644 --- a/.github/workflows/build-with-bal-test-graalvm.yml +++ b/.github/workflows/build-with-bal-test-graalvm.yml @@ -39,7 +39,7 @@ jobs: if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} uses: ballerina-platform/ballerina-standard-library/.github/workflows/build-with-bal-test-graalvm-template.yml@2201.7.x with: - lang_tag: ${{ inputs.lang_tag || 2201.7.x }} + lang_tag: ${{ inputs.lang_tag || '2201.7.x' }} lang_version: ${{ inputs.lang_version }} native_image_options: '-J-Xmx7G ${{ inputs.native_image_options }}' additional_ubuntu_build_flags: '-x :http-native:test -x :http-compiler-plugin-tests:test ${{ inputs.build_properties }}'