add WildFly 31

wildfly-extras · Sep 9, 2024 · 0e8a8c5 · 0e8a8c5
1 parent abdd22c
commit 0e8a8c5
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -565,6 +565,29 @@ Dependencies for `creaper-commands`:
         <version>22.0.2.Final</version>
     </dependency>
 
+#### WildFly 31 (31.0.1) (based on WildFly Core 23)
+
+Dependencies for `creaper-core`:
+
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-controller-client</artifactId>
+        <version>23.0.3.Final</version>
+    </dependency>
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-cli</artifactId>
+        <version>23.0.3.Final</version>
+    </dependency>
+
+Dependencies for `creaper-commands`:
+
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-patching</artifactId>
+        <version>23.0.3.Final</version>
+    </dependency>
+
 ### Transitive Dependencies
 
 These are the dependencies that you will get transitively when you depend

diff --git a/core/src/main/java/org/wildfly/extras/creaper/core/ServerVersion.java b/core/src/main/java/org/wildfly/extras/creaper/core/ServerVersion.java
@@ -104,6 +104,8 @@ public final class ServerVersion {
     public static final ServerVersion VERSION_22_0_0 = new ServerVersion(22, 0, 0);
     /** WF 30.0.x.Final */
     public static final ServerVersion VERSION_23_0_0 = new ServerVersion(23, 0, 0);
+    /** WF 31.0.x.Final */
+    public static final ServerVersion VERSION_24_0_0 = new ServerVersion(24, 0, 0);
 
     private static final ServerVersion[] KNOWN_VERSIONS = {
             VERSION_0_0_0,
@@ -140,7 +142,8 @@ public final class ServerVersion {
             VERSION_20_0_0,
             VERSION_21_0_0,
             VERSION_22_0_0,
-            VERSION_23_0_0
+            VERSION_23_0_0,
+            VERSION_24_0_0
     };
 
     /**

diff --git a/core/src/test/java/org/wildfly/extras/creaper/core/ServerVersionTest.java b/core/src/test/java/org/wildfly/extras/creaper/core/ServerVersionTest.java
@@ -46,6 +46,7 @@ public void referenceEquality() {
         assertSame(ServerVersion.VERSION_21_0_0, ServerVersion.from(21, 0, 0));
         assertSame(ServerVersion.VERSION_22_0_0, ServerVersion.from(22, 0, 0));
         assertSame(ServerVersion.VERSION_23_0_0, ServerVersion.from(23, 0, 0));
+        assertSame(ServerVersion.VERSION_24_0_0, ServerVersion.from(24, 0, 0));
 
         assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
     }
@@ -87,6 +88,7 @@ public void equality() {
         assertSame(ServerVersion.VERSION_21_0_0, ServerVersion.from(21, 0, 0));
         assertSame(ServerVersion.VERSION_22_0_0, ServerVersion.from(22, 0, 0));
         assertSame(ServerVersion.VERSION_23_0_0, ServerVersion.from(23, 0, 0));
+        assertSame(ServerVersion.VERSION_24_0_0, ServerVersion.from(24, 0, 0));
 
         assertEquals(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
     }

diff --git a/core/src/test/java/org/wildfly/extras/creaper/core/offline/OfflineServerVersionTest.java b/core/src/test/java/org/wildfly/extras/creaper/core/offline/OfflineServerVersionTest.java
@@ -69,6 +69,7 @@ public class OfflineServerVersionTest {
     private static final String WFLY28_ROOT = "21.0";
     private static final String WFLY29_ROOT = "22.0";
     private static final String WFLY30_ROOT = "23.0";
+    private static final String WFLY31_ROOT = "24.0";
 
     private static final String COMMUNITY = "community";
     private static final String PREVIEW = "preview";
@@ -212,6 +213,11 @@ public void discoverStandaloneXml_wfly30() throws IOException {
         test(ServerVersion.VERSION_23_0_0, STANDALONE_XML, WFLY30_ROOT, EAP7_LOGGING, EAP8_EE);
     }
 
+    @Test
+    public void discoverStandaloneXml_wfly31() throws IOException {
+        test(ServerVersion.VERSION_24_0_0, STANDALONE_XML, WFLY31_ROOT, EAP7_LOGGING, EAP8_EE);
+    }
+
     public void discoverStandaloneXml_wfly34_community() throws IOException {
         test(ServerVersion.VERSION_20_0_0, STANDALONE_XML, COMMUNITY, WFLY27_ROOT, EAP7_LOGGING, EAP8_EE);
     }
@@ -338,6 +344,11 @@ public void discoverHostXml_wfly30() throws IOException {
         test(ServerVersion.VERSION_23_0_0, HOST_XML, WFLY30_ROOT, EAP7_LOGGING, EAP8_EE);
     }
 
+    @Test
+    public void discoverHostXml_wfly31() throws IOException {
+        test(ServerVersion.VERSION_24_0_0, HOST_XML, WFLY31_ROOT, EAP7_LOGGING, EAP8_EE);
+    }
+
     public void discoverHostXml_wfly34_community() throws IOException {
         test(ServerVersion.VERSION_20_0_0, HOST_XML, COMMUNITY, WFLY27_ROOT, EAP7_LOGGING, EAP8_EE);
     }
@@ -464,6 +475,11 @@ public void discoverDomainXml_wfly30() throws IOException {
         test(ServerVersion.VERSION_23_0_0, DOMAIN_XML, WFLY30_ROOT, EAP7_LOGGING, EAP8_EE);
     }
 
+    @Test
+    public void discoverDomainXml_wfly31() throws IOException {
+        test(ServerVersion.VERSION_24_0_0, DOMAIN_XML, WFLY31_ROOT, EAP7_LOGGING, EAP8_EE);
+    }
+
     public void discoverDomainXml_wfly34_community() throws IOException {
         test(ServerVersion.VERSION_20_0_0, DOMAIN_XML, COMMUNITY, WFLY27_ROOT, EAP7_LOGGING, EAP8_EE);
     }

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -83,6 +83,9 @@
         <version.wildfly30>30.0.1.Final</version.wildfly30>
         <version.wildfly30.core>22.0.2.Final</version.wildfly30.core>
         <version.wildfly30.arquillian>5.0.1.Final</version.wildfly30.arquillian>
+        <version.wildfly31>31.0.1.Final</version.wildfly31>
+        <version.wildfly31.core>23.0.3.Final</version.wildfly31.core>
+        <version.wildfly31.arquillian>5.0.1.Final</version.wildfly31.arquillian>
 
 
         <managementPort.wildfly>9990</managementPort.wildfly>
@@ -237,6 +240,13 @@
         <wildfly30.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly30.arquillianContainer.artifactId>
         <wildfly30.arquillianContainer.version>${version.wildfly30.arquillian}</wildfly30.arquillianContainer.version>
 
+        <wildfly31.applicationServer.groupId>org.wildfly</wildfly31.applicationServer.groupId>
+        <wildfly31.applicationServer.artifactId>wildfly-dist</wildfly31.applicationServer.artifactId>
+        <wildfly31.applicationServer.version>${version.wildfly31}</wildfly31.applicationServer.version>
+        <wildfly31.arquillianContainer.groupId>org.wildfly.arquillian</wildfly31.arquillianContainer.groupId>
+        <wildfly31.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly31.arquillianContainer.artifactId>
+        <wildfly31.arquillianContainer.version>${version.wildfly31.arquillian}</wildfly31.arquillianContainer.version>
+
         <!-- defined in profiles "wildfly10", "wildfly11", "wildfly12", "wildfly13", "wildfly14", "wildfly15",
              "wildfly16", "wildfly17", "wildfly18", "wildfly19" and "wildfly20" below -->
         <applicationServer.groupId>MUST-BE-DEFINED</applicationServer.groupId>
@@ -1334,10 +1344,6 @@
 
         <profile>
             <id>wildfly30</id>
-            <activation>
-                <!-- Note: WildFly 27+ doesn't support JDK 1.8 anymore -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
 
             <properties>
                 <applicationServer.groupId>${wildfly30.applicationServer.groupId}</applicationServer.groupId>
@@ -1381,5 +1387,54 @@
             </dependencies>
         </profile>
 
+        <profile>
+            <id>wildfly31</id>
+            <activation>
+                <!-- Note: WildFly 27+ doesn't support JDK 1.8 anymore -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+            <properties>
+                <applicationServer.groupId>${wildfly31.applicationServer.groupId}</applicationServer.groupId>
+                <applicationServer.artifactId>${wildfly31.applicationServer.artifactId}</applicationServer.artifactId>
+                <applicationServer.version>${wildfly31.applicationServer.version}</applicationServer.version>
+                <applicationServer.managementPort>${managementPort.wildfly}</applicationServer.managementPort>
+
+                <arquillianContainer.groupId>${wildfly31.arquillianContainer.groupId}</arquillianContainer.groupId>
+                <arquillianContainer.artifactId>${wildfly31.arquillianContainer.artifactId}</arquillianContainer.artifactId>
+                <arquillianContainer.version>${wildfly31.arquillianContainer.version}</arquillianContainer.version>
+
+                <tests.ignoredCategory>${ignoredCategory.wildfly11}</tests.ignoredCategory>
+                <tests.specialJvmArgs />
+            </properties>
+
+            <dependencies>
+                <dependency>
+                    <groupId>org.wildfly.extras.creaper</groupId>
+                    <artifactId>creaper-core</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly.extras.creaper</groupId>
+                    <artifactId>creaper-commands</artifactId>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.wildfly.core</groupId>
+                    <artifactId>wildfly-controller-client</artifactId>
+                    <version>${version.wildfly31.core}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly.core</groupId>
+                    <artifactId>wildfly-cli</artifactId>
+                    <version>${version.wildfly31.core}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly.core</groupId>
+                    <artifactId>wildfly-patching</artifactId>
+                    <version>${version.wildfly31.core}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
     </profiles>
 </project>