From 0ef3c1d859c781d16cf824b1d913b9c7b4385744 Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Sun, 13 Aug 2023 12:54:20 +0530 Subject: [PATCH 01/10] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 12 ------------ ballerina/Dependencies.toml | 12 +++++++++++- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 6221b20a..4ad991c9 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -26,15 +26,3 @@ groupId = "javax.jms" artifactId = "javax.jms-api" version = "2.0.1" path = "./lib/javax.jms-api-2.0.1.jar" - -[[platform.java11.dependency]] -path = "./lib/activemq-client-5.18.2.jar" -scope = "testOnly" - -[[platform.java11.dependency]] -path = "./lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar" -scope = "testOnly" - -[[platform.java11.dependency]] -path = "./lib/hawtbuf-1.11.jar" -scope = "testOnly" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 2811df4a..ad3f5a50 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -49,6 +49,15 @@ modules = [ {org = "ballerina", packageName = "test", moduleName = "test"} ] +[[package]] +org = "ballerinax" +name = "activemq.driver" +version = "0.1.0" +scope = "testOnly" +modules = [ + {org = "ballerinax", packageName = "activemq.driver", moduleName = "activemq.driver"} +] + [[package]] org = "ballerinax" name = "java.jms" @@ -56,7 +65,8 @@ version = "0.1.3" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.runtime"}, - {org = "ballerina", name = "test"} + {org = "ballerina", name = "test"}, + {org = "ballerinax", name = "activemq.driver"} ] modules = [ {org = "ballerinax", packageName = "java.jms", moduleName = "java.jms"} From 57787637751a32139c9bd386231576f12bec893f Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Sun, 13 Aug 2023 12:56:01 +0530 Subject: [PATCH 02/10] Use ballerinax/activemq.driver instead of ActiveMQ client jar --- ballerina/build.gradle | 16 ---------------- ballerina/tests/test_commons.bal | 1 + build-config/resources/Ballerina.toml | 12 ------------ build.gradle | 1 + gradle.properties | 4 +--- 5 files changed, 3 insertions(+), 31 deletions(-) diff --git a/ballerina/build.gradle b/ballerina/build.gradle index f208eca7..3422c122 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -75,19 +75,6 @@ dependencies { externalJars(group: 'javax.jms', name: 'javax.jms-api', version: "${javaxJmsVersion}") { transitive = false } - - /** - Test related dependencies - */ - externalJars(group: 'org.apache.activemq', name: 'activemq-client', version: "${activemqClientVersion}") { - transitive = false - } - externalJars(group: 'org.apache.geronimo.specs', name: 'geronimo-j2ee-management_1.1_spec', version: "${geronimoJ2eeMng11SpecVersion}") { - transitive = false - } - externalJars(group: 'org.fusesource.hawtbuf', name: 'hawtbuf', version: "${hawtbufVersion}") { - transitive = false - } } task updateTomlFiles { @@ -98,9 +85,6 @@ task updateTomlFiles { newConfig = newConfig.replace("@toml.version@", tomlVersion) newConfig = newConfig.replace("@slf4j.version@", stdlibDependentSlf4jVersion) newConfig = newConfig.replace("@javax.jms.version@", stdlibDependentJavaxJmsVersion) - newConfig = newConfig.replace('@activemq.client.version@', project.activemqClientVersion) - newConfig = newConfig.replace('@geronimoj2ee.spec.version@', project.geronimoJ2eeMng11SpecVersion) - newConfig = newConfig.replace('@hawtbuf.version@', project.hawtbufVersion) ballerinaTomlFile.text = newConfig } } diff --git a/ballerina/tests/test_commons.bal b/ballerina/tests/test_commons.bal index caf592a1..4fdbe527 100644 --- a/ballerina/tests/test_commons.bal +++ b/ballerina/tests/test_commons.bal @@ -15,6 +15,7 @@ // under the License. import ballerina/test; +import ballerinax/activemq.driver as _; final Connection TEST_CONNECTION = check new ( initialContextFactory = "org.apache.activemq.jndi.ActiveMQInitialContextFactory", diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 5f2c528a..afe784e0 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -26,15 +26,3 @@ groupId = "javax.jms" artifactId = "javax.jms-api" version = "@javax.jms.version@" path = "./lib/javax.jms-api-@javax.jms.version@.jar" - -[[platform.java11.dependency]] -path = "./lib/activemq-client-@activemq.client.version@.jar" -scope = "testOnly" - -[[platform.java11.dependency]] -path = "./lib/geronimo-j2ee-management_1.1_spec-@geronimoj2ee.spec.version@.jar" -scope = "testOnly" - -[[platform.java11.dependency]] -path = "./lib/hawtbuf-@hawtbuf.version@.jar" -scope = "testOnly" diff --git a/build.gradle b/build.gradle index 1706a8e3..09aa5326 100644 --- a/build.gradle +++ b/build.gradle @@ -77,6 +77,7 @@ subprojects { ballerinaStdLibs "io.ballerina.stdlib:io-ballerina:${stdlibIoVersion}" ballerinaStdLibs "io.ballerina.stdlib:observe-ballerina:${observeVersion}" ballerinaStdLibs "io.ballerina:observe-ballerina:${observeInternalVersion}" + ballerinaStdLibs "io.ballerina.stdlib:activemq.driver-ballerina:${activeMQDriverVersion}" } task allDeps(type: DependencyReportTask) {} diff --git a/gradle.properties b/gradle.properties index e9890c26..660fe34d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,9 +15,7 @@ javaxJmsVersion=2.0.1 slf4jVersion=2.0.7 # Test dependenices -activemqClientVersion=5.18.2 -geronimoJ2eeMng11SpecVersion=1.0.1 -hawtbufVersion=1.11 +activeMQDriverVersion=0.1.0 #stdlib dependencies From d2b36559e262effb4ce50c989365cf909895d7ce Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Mon, 14 Aug 2023 10:39:42 +0530 Subject: [PATCH 03/10] Migrate activemq-driver to SL U7 --- build-config/resources/Ballerina.toml | 2 +- gradle.properties | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index afe784e0..ac9ef3f4 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -7,7 +7,7 @@ keywords = ["jms"] repository = "https://github.com/ballerina-platform/module-ballerina-java.jms" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.6.0" +distribution = "2201.7.0" [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" diff --git a/gradle.properties b/gradle.properties index 660fe34d..a625af82 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.caching=true group=io.ballerina.stdlib -version=0.1.3-SNAPSHOT -ballerinaLangVersion=2201.6.0 +version=0.2.0-SNAPSHOT +ballerinaLangVersion=2201.7.0 checkstylePluginVersion=8.18 spotbugsPluginVersion=4.5.1 @@ -15,7 +15,7 @@ javaxJmsVersion=2.0.1 slf4jVersion=2.0.7 # Test dependenices -activeMQDriverVersion=0.1.0 +activeMQDriverVersion=0.2.0 #stdlib dependencies From 8f4130d57d91f7457bd9da3689f94a18c78d7745 Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Mon, 14 Aug 2023 10:39:55 +0530 Subject: [PATCH 04/10] Update graalvm workflow --- .github/workflows/build-with-bal-test-graalvm.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml index b3a15155..1534fcd4 100644 --- a/.github/workflows/build-with-bal-test-graalvm.yml +++ b/.github/workflows/build-with-bal-test-graalvm.yml @@ -6,7 +6,7 @@ on: lang_tag: description: Branch/Release Tag of the Ballerina Lang required: true - default: master + default: 2201.7.x lang_version: description: Ballerina Lang Version (If given ballerina lang buid will be skipped) required: false @@ -30,10 +30,8 @@ jobs: call_stdlib_workflow: name: Run StdLib Workflow 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@main + uses: ballerina-platform/ballerina-standard-library/.github/workflows/build-with-bal-test-graalvm-template.yml@2201.7.x with: lang_tag: ${{ inputs.lang_tag }} lang_version: ${{ inputs.lang_version }} native_image_options: ${{ inputs.native_image_options }} -# additional_ubuntu_build_flags: '-x :email-compiler-plugin-tests:test' -# additional_windows_build_flags: '-x :email-compiler-plugin-tests:test' From 7efe7ad3f58acee20859bb130fdf44228e80a9dd Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Mon, 14 Aug 2023 10:41:57 +0530 Subject: [PATCH 05/10] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 8 ++++---- ballerina/Dependencies.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 4ad991c9..06b1ad75 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,19 +1,19 @@ [package] org = "ballerinax" name = "java.jms" -version = "0.1.3" +version = "0.2.0" authors = ["Ballerina"] keywords = ["jms"] repository = "https://github.com/ballerina-platform/module-ballerina-java.jms" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.6.0" +distribution = "2201.7.0" [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" artifactId = "java.jms-native" -version = "0.1.3" -path = "../native/build/libs/java.jms-native-0.1.3-SNAPSHOT.jar" +version = "0.2.0" +path = "../native/build/libs/java.jms-native-0.2.0-SNAPSHOT.jar" [[platform.java11.dependency]] groupId = "org.slf4j" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index ad3f5a50..39b0998c 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.6.0" +distribution-version = "2201.7.0" [[package]] org = "ballerina" @@ -61,7 +61,7 @@ modules = [ [[package]] org = "ballerinax" name = "java.jms" -version = "0.1.3" +version = "0.2.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.runtime"}, From 8244c6c7cb5b9894870b45244d96727011c4a6ba Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Mon, 14 Aug 2023 11:03:50 +0530 Subject: [PATCH 06/10] [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 39b0998c..45494992 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -52,7 +52,7 @@ modules = [ [[package]] org = "ballerinax" name = "activemq.driver" -version = "0.1.0" +version = "0.2.0" scope = "testOnly" modules = [ {org = "ballerinax", packageName = "activemq.driver", moduleName = "activemq.driver"} From 12abdcefc4b2f9f2e820875ca6743d028d74319d Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Mon, 14 Aug 2023 13:02:55 +0530 Subject: [PATCH 07/10] Update gradle plugin version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a625af82..9664e390 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ spotbugsPluginVersion=4.5.1 shadowJarPluginVersion=5.2.0 downloadPluginVersion=4.0.4 releasePluginVersion=2.6.0 -ballerinaGradlePluginVersion=1.0.0 +ballerinaGradlePluginVersion=1.1.0 # JMS dependencies javaxJmsVersion=2.0.1 From e6496b9fb7f3a03e4333c414208493ffd602a1f2 Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Mon, 14 Aug 2023 13:05:42 +0530 Subject: [PATCH 08/10] Update graalvm workflow --- .github/workflows/build-with-bal-test-graalvm.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml index 1534fcd4..e88db618 100644 --- a/.github/workflows/build-with-bal-test-graalvm.yml +++ b/.github/workflows/build-with-bal-test-graalvm.yml @@ -35,3 +35,4 @@ jobs: lang_tag: ${{ inputs.lang_tag }} lang_version: ${{ inputs.lang_version }} native_image_options: ${{ inputs.native_image_options }} + additional_windows_build_flags: '-x test' From 5f87d94a4c3405a9730a7282187c2e2540585b3f Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Mon, 14 Aug 2023 13:24:09 +0530 Subject: [PATCH 09/10] Mark the package as graalvm compatible --- build-config/resources/Ballerina.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index ac9ef3f4..3fe373ae 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -9,6 +9,9 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.7.0" +[platform.java11] +graalvmCompatible = true + [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" artifactId = "java.jms-native" From 6e0d3b2dea084c40c81cbf18a74f5172a0727c26 Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Mon, 14 Aug 2023 13:26:00 +0530 Subject: [PATCH 10/10] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 06b1ad75..fc02a716 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -9,6 +9,9 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.7.0" +[platform.java11] +graalvmCompatible = true + [[platform.java11.dependency]] groupId = "io.ballerina.stdlib" artifactId = "java.jms-native"