From a1789902d2f08c16a57523979994a9973b91b6b2 Mon Sep 17 00:00:00 2001
From: Johannes Beck <mail@johannes-beck.name>
Date: Tue, 30 Apr 2024 18:29:08 +0200
Subject: [PATCH] Update wildfly-jar, allow remote debug to suspend

---
 pom.xml                                           | 6 ++----
 src/test/java/x1/arquillian/WildflyContainer.java | 6 ++++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 76d75847..968a2361 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1012,8 +1012,6 @@
         <profile>
             <id>wildfly-jar</id>
             <properties>
-                <maven.compiler.target>17</maven.compiler.target>
-                <maven.compiler.source>17</maven.compiler.source>
                 <jkube.generator.name>registry.x1/j7beck/x1-wildfly-jar-stomp-test:%v</jkube.generator.name>
                 <jkube.generator.registry>registry.x1</jkube.generator.registry>
             </properties>
@@ -1023,7 +1021,7 @@
                     <plugin>
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-jar-maven-plugin</artifactId>
-                        <version>10.0.0.Final</version>
+                        <version>11.0.1.Final</version>
                         <configuration>
                             <feature-packs>
                                 <feature-pack>
@@ -1032,7 +1030,7 @@
                                 <feature-pack>
                                     <groupId>org.wildfly</groupId>
                                     <artifactId>wildfly-datasources-galleon-pack</artifactId>
-                                    <version>7.0.0.Final</version>
+                                    <version>8.0.0.Final</version>
                                 </feature-pack>
                             </feature-packs>
                             <layers>
diff --git a/src/test/java/x1/arquillian/WildflyContainer.java b/src/test/java/x1/arquillian/WildflyContainer.java
index f2ef9495..008f8d20 100644
--- a/src/test/java/x1/arquillian/WildflyContainer.java
+++ b/src/test/java/x1/arquillian/WildflyContainer.java
@@ -76,10 +76,12 @@ public WildflyContainer withConfigurationDirectory(String directory) {
 
   public WildflyContainer withRemoteDebug() {
     if (Boolean.getBoolean("arquillian.remote.debug")) {
-      LOGGER.info("Enable remote debugging on port {}", DEBUG_PORT);
+      var suspend = Boolean.getBoolean("arquillian.remote.debug.suspend") ? "y" : "n";
+      LOGGER.info("Enable remote debugging on port {} with suspend={}", DEBUG_PORT, suspend);
       addFixedExposedPort(DEBUG_PORT, DEBUG_PORT);
       withEnv("JAVA_OPTS",
-          "-Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -XX:+UseG1GC -XX:+UseStringDeduplication -Djava.net.preferIPv4Stack=true -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true -agentlib:jdwp=transport=dt_socket,address=*:8787,server=y,suspend=n");
+          "-server -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -XX:+UseG1GC -XX:+UseStringDeduplication -Djava.net.preferIPv4Stack=true -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true -agentlib:jdwp=transport=dt_socket,address=*:"
+              + DEBUG_PORT + ",server=y,suspend=" + suspend);
     }
     return this;
   }