Merge pull request #102 from ayeshLK/jms-tests

Use `ballerinax/activemq.driver` instead of ActiveMQ client jar

.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'

ballerina/Ballerina.toml

@@ -1,19 +1,22 @@
 [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]
+graalvmCompatible = true
 
 [[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"
@@ -26,15 +29,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"

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"
@@ -49,14 +49,24 @@ modules = [
 	{org = "ballerina", packageName = "test", moduleName = "test"}
 ]
 
+[[package]]
+org = "ballerinax"
+name = "activemq.driver"
+version = "0.2.0"
+scope = "testOnly"
+modules = [
+	{org = "ballerinax", packageName = "activemq.driver", moduleName = "activemq.driver"}
+]
+
 [[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"},
-	{org = "ballerina", name = "test"}
+	{org = "ballerina", name = "test"},
+	{org = "ballerinax", name = "activemq.driver"}
 ]
 modules = [
 	{org = "ballerinax", packageName = "java.jms", moduleName = "java.jms"}

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
     }
 }

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",

build-config/resources/Ballerina.toml

@@ -7,7 +7,10 @@ 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]
+graalvmCompatible = true
 
 [[platform.java11.dependency]]
 groupId = "io.ballerina.stdlib"
@@ -26,15 +29,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"

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) {}

gradle.properties

@@ -1,23 +1,21 @@
 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
 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
 slf4jVersion=2.0.7
 
 # Test dependenices
-activemqClientVersion=5.18.2
-geronimoJ2eeMng11SpecVersion=1.0.1
-hawtbufVersion=1.11
+activeMQDriverVersion=0.2.0
 
 #stdlib dependencies