add WildFly 25

wildfly-extras · Jun 16, 2022 · 6f7734e · 6f7734e
1 parent b8f890d
commit 6f7734e
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -427,6 +427,29 @@ Dependencies for `creaper-commands`:
         <version>16.0.1.Final</version>
     </dependency>
 
+#### WildFly 25 (25.0.1) (based on WildFly Core 17)
+
+Dependencies for `creaper-core`:
+
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-controller-client</artifactId>
+        <version>17.0.3.Final</version>
+    </dependency>
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-cli</artifactId>
+        <version>17.0.3.Final</version>
+    </dependency>
+
+Dependencies for `creaper-commands`:
+
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-patching</artifactId>
+        <version>17.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
@@ -92,6 +92,8 @@ public final class ServerVersion {
     public static final ServerVersion VERSION_16_0_0 = new ServerVersion(16, 0, 0);
     /** WF 24.0.x.Final */
     public static final ServerVersion VERSION_17_0_0 = new ServerVersion(17, 0, 0);
+    /** WF 25.0.x.Final */
+    public static final ServerVersion VERSION_18_0_0 = new ServerVersion(18, 0, 0);
 
     private static final ServerVersion[] KNOWN_VERSIONS = {
             VERSION_0_0_0,
@@ -122,7 +124,8 @@ public final class ServerVersion {
             VERSION_14_0_0,
             VERSION_15_0_0,
             VERSION_16_0_0,
-            VERSION_17_0_0
+            VERSION_17_0_0,
+            VERSION_18_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
@@ -40,6 +40,7 @@ public void referenceEquality() {
         assertSame(ServerVersion.VERSION_15_0_0, ServerVersion.from(15, 0, 0));
         assertSame(ServerVersion.VERSION_16_0_0, ServerVersion.from(16, 0, 0));
         assertSame(ServerVersion.VERSION_17_0_0, ServerVersion.from(17, 0, 0));
+        assertSame(ServerVersion.VERSION_18_0_0, ServerVersion.from(18, 0, 0));
 
         assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
     }
@@ -75,6 +76,7 @@ public void equality() {
         assertSame(ServerVersion.VERSION_15_0_0, ServerVersion.from(15, 0, 0));
         assertSame(ServerVersion.VERSION_16_0_0, ServerVersion.from(16, 0, 0));
         assertSame(ServerVersion.VERSION_17_0_0, ServerVersion.from(17, 0, 0));
+        assertSame(ServerVersion.VERSION_18_0_0, ServerVersion.from(18, 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
@@ -61,6 +61,7 @@ public class OfflineServerVersionTest {
     private static final String WFLY22_ROOT = "15.0";
     private static final String WFLY23_ROOT = "16.0";
     private static final String WFLY24_ROOT = "17.0";
+    private static final String WFLY25_ROOT = "18.0";
 
     @Rule
     public final TemporaryFolder tmp = new TemporaryFolder();
@@ -170,6 +171,11 @@ public void discoverStandaloneXml_wfly24() throws IOException {
         test(ServerVersion.VERSION_17_0_0, STANDALONE_XML, WFLY24_ROOT, EAP7_LOGGING, EAP7_EE);
     }
 
+    @Test
+    public void discoverStandaloneXml_wfly25() throws IOException {
+        test(ServerVersion.VERSION_18_0_0, STANDALONE_XML, WFLY25_ROOT, EAP7_LOGGING, EAP7_EE);
+    }
+
     @Test
     public void discoverHostXml_eap6() throws IOException {
         test(ServerVersion.VERSION_1_7_0, HOST_XML, EAP6_ROOT, EAP6_LOGGING, EAP6_EE);
@@ -250,6 +256,11 @@ public void discoverHostXml_wfly24() throws IOException {
         test(ServerVersion.VERSION_17_0_0, HOST_XML, WFLY24_ROOT, EAP7_LOGGING, EAP7_EE);
     }
 
+    @Test
+    public void discoverHostXml_wfly25() throws IOException {
+        test(ServerVersion.VERSION_18_0_0, HOST_XML, WFLY25_ROOT, EAP7_LOGGING, EAP7_EE);
+    }
+
     @Test
     public void discoverDomainXml_eap6() throws IOException {
         test(ServerVersion.VERSION_1_7_0, DOMAIN_XML, EAP6_ROOT, EAP6_LOGGING, EAP6_EE);
@@ -330,6 +341,11 @@ public void discoverDomainXml_wfly24() throws IOException {
         test(ServerVersion.VERSION_17_0_0, DOMAIN_XML, WFLY24_ROOT, EAP7_LOGGING, EAP7_EE);
     }
 
+    @Test
+    public void discoverDomainXml_wfly25() throws IOException {
+        test(ServerVersion.VERSION_18_0_0, DOMAIN_XML, WFLY25_ROOT, EAP7_LOGGING, EAP7_EE);
+    }
+
     private void test(ServerVersion expected, String xmlPattern,
                       String rootVersion, String loggingVersion, String eeVersion) throws IOException {
         String xml = xmlPattern

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -65,6 +65,9 @@
         <version.wildfly24>24.0.1.Final</version.wildfly24>
         <version.wildfly24.core>16.0.1.Final</version.wildfly24.core>
         <version.wildfly24.arquillian>3.0.1.Final</version.wildfly24.arquillian>
+        <version.wildfly25>25.0.1.Final</version.wildfly25>
+        <version.wildfly25.core>17.0.3.Final</version.wildfly25.core>
+        <version.wildfly25.arquillian>3.0.1.Final</version.wildfly25.arquillian>
 
 
         <managementPort.wildfly>9990</managementPort.wildfly>
@@ -179,6 +182,13 @@
         <wildfly24.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly24.arquillianContainer.artifactId>
         <wildfly24.arquillianContainer.version>${version.wildfly24.arquillian}</wildfly24.arquillianContainer.version>
 
+        <wildfly25.applicationServer.groupId>org.wildfly</wildfly25.applicationServer.groupId>
+        <wildfly25.applicationServer.artifactId>wildfly-dist</wildfly25.applicationServer.artifactId>
+        <wildfly25.applicationServer.version>${version.wildfly25}</wildfly25.applicationServer.version>
+        <wildfly25.arquillianContainer.groupId>org.wildfly.arquillian</wildfly25.arquillianContainer.groupId>
+        <wildfly25.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly25.arquillianContainer.artifactId>
+        <wildfly25.arquillianContainer.version>${version.wildfly25.arquillian}</wildfly25.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>
@@ -1034,9 +1044,6 @@
 
         <profile>
             <id>wildfly24</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
 
             <properties>
                 <version.java>1.8</version.java>
@@ -1082,5 +1089,55 @@
             </dependencies>
         </profile>
 
+        <profile>
+            <id>wildfly25</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+            <properties>
+                <version.java>1.8</version.java>
+
+                <applicationServer.groupId>${wildfly25.applicationServer.groupId}</applicationServer.groupId>
+                <applicationServer.artifactId>${wildfly25.applicationServer.artifactId}</applicationServer.artifactId>
+                <applicationServer.version>${wildfly25.applicationServer.version}</applicationServer.version>
+                <applicationServer.managementPort>${managementPort.wildfly}</applicationServer.managementPort>
+
+                <arquillianContainer.groupId>${wildfly25.arquillianContainer.groupId}</arquillianContainer.groupId>
+                <arquillianContainer.artifactId>${wildfly25.arquillianContainer.artifactId}</arquillianContainer.artifactId>
+                <arquillianContainer.version>${wildfly25.arquillianContainer.version}</arquillianContainer.version>
+
+                <tests.ignoredCategory>${ignoredCategory.wildfly11}</tests.ignoredCategory>
+                <tests.specialJvmArgs>${specialJvmArgs.wildfly}</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.wildfly25.core}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly.core</groupId>
+                    <artifactId>wildfly-cli</artifactId>
+                    <version>${version.wildfly25.core}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly.core</groupId>
+                    <artifactId>wildfly-patching</artifactId>
+                    <version>${version.wildfly25.core}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
     </profiles>
 </project>