From 583bc4a1fc784ffa86a853103903f61c1f6089e2 Mon Sep 17 00:00:00 2001 From: Nuvindu Date: Fri, 3 Nov 2023 12:54:45 +0530 Subject: [PATCH 1/5] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index d82d21b..7c01fc2 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -37,5 +37,5 @@ path = "./lib/wss4j-ws-security-common-3.0.1.jar" [[platform.java17.dependency]] groupId = "org.apache.santuario" artifactId = "xmlsec" -version = "3.0.2" -path = "./lib/xmlsec-3.0.2.jar" +version = "3.0.3" +path = "./lib/xmlsec-3.0.3.jar" From f9dc94040dcd9e4e100a30de41e3acb45678f195 Mon Sep 17 00:00:00 2001 From: Nuvindu Date: Fri, 3 Nov 2023 12:57:10 +0530 Subject: [PATCH 2/5] Update xml security for Java library version to 3.0.3 --- gradle.properties | 2 +- native/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1cb266f..8b8f42f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,7 +36,7 @@ stdlibHttpVersion=2.10.1 stdlibTransactionVersion=1.8.0 wsSecurityDomVersion=3.0.1 wsSecurityCommonVersion=3.0.1 -xmlSecVersion=3.0.2 +xmlSecVersion=3.0.3 # Ballerinax Observer observeVersion=1.2.0 diff --git a/native/build.gradle b/native/build.gradle index 482d386..4ba7edf 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}" implementation 'com.google.guava:guava:32.1.1-jre' implementation 'org.apache.wss4j:wss4j-ws-security-dom:3.0.1' - implementation 'org.apache.santuario:xmlsec:3.0.2' + implementation 'org.apache.santuario:xmlsec:3.0.3' implementation 'org.apache.wss4j:wss4j-ws-security-common:3.0.1' compileOnly group: 'org.graalvm.nativeimage', name: 'svm', version: '22.2.0' } From 8b1d56d868b6eddcae4db67524ead4f4ca321689 Mon Sep 17 00:00:00 2001 From: Nuvindu Date: Fri, 3 Nov 2023 13:59:13 +0530 Subject: [PATCH 3/5] Apply suggestions from the review --- native/build.gradle | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/native/build.gradle b/native/build.gradle index 4ba7edf..f849fe8 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -28,10 +28,9 @@ dependencies { checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}" - implementation 'com.google.guava:guava:32.1.1-jre' - implementation 'org.apache.wss4j:wss4j-ws-security-dom:3.0.1' - implementation 'org.apache.santuario:xmlsec:3.0.3' - implementation 'org.apache.wss4j:wss4j-ws-security-common:3.0.1' + implementation group: 'org.apache.wss4j', name: 'wss4j-ws-security-dom', version: "${wsSecurityDomVersion}" + implementation group: 'org.apache.wss4j', name: 'wss4j-ws-security-common', version: "${wsSecurityCommonVersion}" + implementation group: 'org.apache.santuario', name: 'xmlsec', version: "${xmlSecVersion}" compileOnly group: 'org.graalvm.nativeimage', name: 'svm', version: '22.2.0' } From b3e210f51354f1ec84e892d88fd5cbc68a955865 Mon Sep 17 00:00:00 2001 From: Nuvindu Date: Fri, 3 Nov 2023 14:09:53 +0530 Subject: [PATCH 4/5] [Automated] Update the native jar versions --- ballerina/Dependencies.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index e906e2c..1ed4692 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -64,7 +64,7 @@ dependencies = [ [[package]] org = "ballerina" name = "http" -version = "2.10.3" +version = "2.10.1" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, From 730df9bfcc6d6fa7efa6877e29a8c52835fc3797 Mon Sep 17 00:00:00 2001 From: Nuvindu Date: Fri, 3 Nov 2023 14:10:59 +0530 Subject: [PATCH 5/5] Add Google guava dependency --- gradle.properties | 1 + native/build.gradle | 1 + 2 files changed, 2 insertions(+) diff --git a/gradle.properties b/gradle.properties index 8b8f42f..6070cda 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,6 +37,7 @@ stdlibTransactionVersion=1.8.0 wsSecurityDomVersion=3.0.1 wsSecurityCommonVersion=3.0.1 xmlSecVersion=3.0.3 +guavaVersion=32.1.1-jre # Ballerinax Observer observeVersion=1.2.0 diff --git a/native/build.gradle b/native/build.gradle index f849fe8..59e48b9 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -28,6 +28,7 @@ dependencies { checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}" + implementation group: 'com.google.guava', name: 'guava', version: "${guavaVersion}" implementation group: 'org.apache.wss4j', name: 'wss4j-ws-security-dom', version: "${wsSecurityDomVersion}" implementation group: 'org.apache.wss4j', name: 'wss4j-ws-security-common', version: "${wsSecurityCommonVersion}" implementation group: 'org.apache.santuario', name: 'xmlsec', version: "${xmlSecVersion}"