Use test resources, fix GraalVM metadata and add GraalVM tests (#355)

buildSrc/build.gradle

@@ -5,9 +5,6 @@ plugins {
 repositories {
     gradlePluginPortal()
     mavenCentral()
-    // need to pull in micronaut-gradle-plugin:4.0.0-SNAPSHOT
-    // to prevent leaking codehaus groovy from micronaut-test 3.x
-    maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
 }
 
 dependencies {

buildSrc/settings.gradle

@@ -1,3 +1,4 @@
+rootProject.name = 'jms-parent'
 dependencyResolutionManagement {
     versionCatalogs {
         libs {

buildSrc/src/main/groovy/io.micronaut.build.internal.jms-application.gradle

@@ -0,0 +1,25 @@
+plugins {
+    id 'io.micronaut.build.internal.jms-base'
+    id 'io.micronaut.application'
+}
+configurations.all {
+    resolutionStrategy.dependencySubstitution {
+        substitute module('io.micronaut.jms:micronaut-jms-core') using project(':micronaut-jms-core')
+        substitute module('io.micronaut.jms:micronaut-jms-activemq-classic') using project(':micronaut-jms-activemq-classic')
+        substitute module('io.micronaut.jms:micronaut-jms-activemq-artemis') using project(':micronaut-jms-activemq-artemis')
+        substitute module('io.micronaut.jms:micronaut-jms-sqs') using project(':micronaut-jms-sqs')
+    }
+}
+micronaut {
+    version libs.versions.micronaut.platform.get()
+    runtime "netty"
+}
+
+application {
+    mainClass = 'example.Application'
+}
+
+dependencies {
+    runtimeOnly(mn.snakeyaml)
+    testImplementation(mn.logback.classic)
+}

buildSrc/src/main/groovy/io.micronaut.build.internal.jms-examples.gradle

@@ -1,15 +1,10 @@
 plugins {
-    id 'io.micronaut.build.internal.jms-base'
-    id 'io.micronaut.minimal.application'
-}
-
-micronaut {
-    version libs.versions.micronaut
-    runtime 'netty'
+    id 'io.micronaut.build.internal.jms-application'
 }
 
 dependencies {
     testCompileOnly libs.jsr305 // for "warning: unknown enum constant When.MAYBE"
     testImplementation projects.micronautJmsActivemqClassic
     testImplementation libs.activemq.broker
+    testImplementation(mn.logback.classic)
 }

buildSrc/src/main/groovy/io.micronaut.build.internal.jms-native-tests.gradle

@@ -0,0 +1,12 @@
+plugins {
+    id 'io.micronaut.build.internal.jms-application'
+}
+
+tasks.named("check") { task ->
+    def graal = ["jvmci.Compiler", "java.vendor.version", "java.vendor"].any {
+        System.getProperty(it)?.toLowerCase(Locale.ENGLISH)?.contains("graal")
+    }
+    if (graal) {
+        task.dependsOn("nativeTest")
+    }
+}

buildSrc/src/main/groovy/io.micronaut.build.internal.jms-tests.gradle

@@ -1,25 +1,18 @@
 plugins {
     id 'groovy'
-    id 'io.micronaut.build.internal.jms-base'
-    id 'io.micronaut.application'
-}
-
-application {
-    mainClass = 'example.Application'
+    id 'io.micronaut.build.internal.jms-application'
+    id 'io.micronaut.test-resources'
 }
 
 micronaut {
-    version '4.0.0-SNAPSHOT'
-    runtime 'netty'
-    testRuntime 'spock'
+    testResources {
+        clientTimeout = 300
+    }
 }
-
-
 dependencies {
 
     testImplementation mnTest.micronaut.test.core
     testImplementation mn.micronaut.http.client
-    testImplementation libs.testcontainers.spock
 
     // without this :tests:tasks-activemq-artemis TasksSpec fails with ClassNotFoundException for javax.json.JsonValue
     runtimeOnly(libs.javax.json.api)

docs-examples/example-groovy/build.gradle

@@ -4,7 +4,6 @@ plugins {
 }
 
 micronaut {
-    version = '4.0.0-SNAPSHOT'
     testRuntime 'spock'
 }
 

docs-examples/example-java/build.gradle

@@ -1,15 +1,13 @@
 plugins {
     id 'io.micronaut.build.internal.jms-examples'
-    id 'io.micronaut.application'
-    id 'java'
+    id 'io.micronaut.build.internal.jms-native-tests'
 }
 
 dependencies {
     testImplementation libs.awaitility
 }
 
 micronaut {
-    version = '4.0.0-SNAPSHOT'
     testRuntime 'junit5'
 }
 

docs-examples/example-java/src/test/java/io/micronaut/jms/docs/binding/MapConsumer.java

@@ -39,7 +39,7 @@ public class MapConsumer {
     List<Map<String, Object>> messageHeaders = Collections.synchronizedList(new ArrayList<>());
     List<javax.jms.Message> messages = Collections.synchronizedList(new ArrayList<>());
 
-    @Queue(value = "queue_map", concurrency = "1-5")
+    @Queue(value = "queue_map")
     public void receive(@MessageBody Map<String, Serializable> body,
                         @Message javax.jms.Message message,
                         @MessageHeader(JMS_CORRELATION_ID) @Nullable String correlationId,

docs-examples/example-java/src/test/java/io/micronaut/jms/docs/binding/SelectorConsumer.java

@@ -25,12 +25,12 @@ public class SelectorConsumer {
 
     List<String> messageBodiesTopic = Collections.synchronizedList(new ArrayList<>());
 
-    @Queue(value = "selector_queue", concurrency = "1-5", messageSelector = "CustomBooleanHeader=true")
+    @Queue(value = "selector_queue", messageSelector = "CustomBooleanHeader=true")
     public void receive(@MessageBody String body) {
         messageBodiesTrue.add(body);
     }
 
-    @Queue(value = "selector_queue", concurrency = "1-5", messageSelector = "CustomBooleanHeader=false")
+    @Queue(value = "selector_queue", messageSelector = "CustomBooleanHeader=false")
     public void receive2(@MessageBody String body) {
         messageBodiesFalse.add(body);
     }

docs-examples/example-java/src/test/java/io/micronaut/jms/docs/exceptions/ErrorThrowingConsumer.java

@@ -25,7 +25,7 @@ class ErrorThrowingConsumer {
 
     Collection<String> messages = Collections.synchronizedSet(new HashSet<>());
 
-    @Queue(value = "error-queue", concurrency = "1-1", errorHandlers = {CountingErrorHandler.class}) // <2>
+    @Queue(value = "error-queue", errorHandlers = {CountingErrorHandler.class}) // <2>
     void receive(@MessageBody String message) {
         if ("throw an error".equalsIgnoreCase(message)) {
             throw new RuntimeException("this is an error"); // <3>

docs-examples/example-java/src/test/java/io/micronaut/jms/docs/quickstart/TextConsumer.java

@@ -20,7 +20,7 @@ public class TextConsumer {
 
     List<String> messages = Collections.synchronizedList(new ArrayList<>());
 
-    @Queue(value = "queue_text", concurrency = "1-5") // <2>
+    @Queue(value = "queue_text") // <2>
     public void receive(@MessageBody String body) { // <3>
         messages.add(body);
     }

docs-examples/example-java/src/test/java/io/micronaut/jms/docs/successhandler/SuccessHandlingConsumer.java

@@ -28,7 +28,7 @@ class SuccessHandlingConsumer {
 
     Collection<String> messages = Collections.synchronizedSet(new HashSet<>());
 
-    @Queue(value = "success-queue", concurrency = "1-1", successHandlers = {CountingSuccessHandler.class})  // <2>
+    @Queue(value = "success-queue", successHandlers = {CountingSuccessHandler.class})  // <2>
     void receive(@MessageBody String message) throws JMSException {
         messages.add(message);
     }

docs-examples/example-kotlin/build.gradle

@@ -11,7 +11,6 @@ dependencies {
 }
 
 micronaut {
-    version = '4.0.0-SNAPSHOT'
     testRuntime 'kotest5'
 }
 

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 micronaut-docs = "2.0.0"
-micronaut = "4.0.0-M1"
-micronaut-test = "4.0.0-SNAPSHOT"
-
+micronaut = "4.0.0-M2"
+micronaut-test = "4.0.0-M1"
+micronaut-platform = "4.0.0-M1"
 activemq = '5.17.3'
 amazon-sqs-messaging = '2.0.3'
 artemis-client = '2.28.0'
@@ -18,12 +18,12 @@ jsr305 = "3.0.2"
 kotlin = '1.8.10'
 spock = "2.3-groovy-4.0"
 spotbugs = "4.7.1"
-testcontainers = '1.17.6'
+testcontainers = '1.18.0'
 lombok = '1.18.26'
 
 micronaut-aws-v2 = '3.13.1'
 micronaut-validation = "4.0.0-M2"
-micronaut-gradle-plugin = "4.0.0-SNAPSHOT"
+micronaut-gradle-plugin = "4.0.0-M1"
 
 [libraries]
 micronaut-validation = { module = "io.micronaut.validation:micronaut-validation-bom", version.ref = "micronaut-validation" }