add WildFly 28

wildfly-extras · Jun 28, 2023 · 63d0a98 · 63d0a98
1 parent 246f5d6
commit 63d0a98
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 2.0.3 (not yet released)
 
+- added support for WildFly 28
+
 ## 2.0.2 (2023-01-18)
 
 - reverted `jboss-logging` -> `wildfly-logging` change

diff --git a/README.md b/README.md
@@ -496,6 +496,29 @@ Dependencies for `creaper-commands`:
         <version>19.0.1.Final</version>
     </dependency>
 
+#### WildFly 28 (28.0.1) (based on WildFly Core 20)
+
+Dependencies for `creaper-core`:
+
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-controller-client</artifactId>
+        <version>20.0.2.Final</version>
+    </dependency>
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-cli</artifactId>
+        <version>20.0.2.Final</version>
+    </dependency>
+
+Dependencies for `creaper-commands`:
+
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-patching</artifactId>
+        <version>20.0.2.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
@@ -98,6 +98,8 @@ public final class ServerVersion {
     public static final ServerVersion VERSION_19_0_0 = new ServerVersion(19, 0, 0);
     /** WF 27.0.x.Final */
     public static final ServerVersion VERSION_20_0_0 = new ServerVersion(20, 0, 0);
+    /** WF 28.0.x.Final */
+    public static final ServerVersion VERSION_21_0_0 = new ServerVersion(21, 0, 0);
 
     private static final ServerVersion[] KNOWN_VERSIONS = {
             VERSION_0_0_0,
@@ -131,7 +133,8 @@ public final class ServerVersion {
             VERSION_17_0_0,
             VERSION_18_0_0,
             VERSION_19_0_0,
-            VERSION_20_0_0
+            VERSION_20_0_0,
+            VERSION_21_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
@@ -43,6 +43,7 @@ public void referenceEquality() {
         assertSame(ServerVersion.VERSION_18_0_0, ServerVersion.from(18, 0, 0));
         assertSame(ServerVersion.VERSION_19_0_0, ServerVersion.from(19, 0, 0));
         assertSame(ServerVersion.VERSION_20_0_0, ServerVersion.from(20, 0, 0));
+        assertSame(ServerVersion.VERSION_21_0_0, ServerVersion.from(21, 0, 0));
 
         assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
     }
@@ -81,6 +82,7 @@ public void equality() {
         assertSame(ServerVersion.VERSION_18_0_0, ServerVersion.from(18, 0, 0));
         assertSame(ServerVersion.VERSION_19_0_0, ServerVersion.from(19, 0, 0));
         assertSame(ServerVersion.VERSION_20_0_0, ServerVersion.from(20, 0, 0));
+        assertSame(ServerVersion.VERSION_21_0_0, ServerVersion.from(21, 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
@@ -66,6 +66,7 @@ public class OfflineServerVersionTest {
     private static final String WFLY25_ROOT = "18.0";
     private static final String WFLY26_ROOT = "19.0";
     private static final String WFLY27_ROOT = "20.0";
+    private static final String WFLY28_ROOT = "21.0";
 
     @Rule
     public final TemporaryFolder tmp = new TemporaryFolder();
@@ -190,6 +191,11 @@ public void discoverStandaloneXml_wfly27() throws IOException {
         test(ServerVersion.VERSION_20_0_0, STANDALONE_XML, WFLY27_ROOT, EAP7_LOGGING, EAP8_EE);
     }
 
+    @Test
+    public void discoverStandaloneXml_wfly28() throws IOException {
+        test(ServerVersion.VERSION_21_0_0, STANDALONE_XML, WFLY28_ROOT, EAP7_LOGGING, EAP8_EE);
+    }
+
     @Test
     public void discoverHostXml_eap6() throws IOException {
         test(ServerVersion.VERSION_1_7_0, HOST_XML, EAP6_ROOT, EAP6_LOGGING, EAP6_EE);
@@ -285,6 +291,11 @@ public void discoverHostXml_wfly27() throws IOException {
         test(ServerVersion.VERSION_20_0_0, HOST_XML, WFLY27_ROOT, EAP7_LOGGING, EAP8_EE);
     }
 
+    @Test
+    public void discoverHostXml_wfly28() throws IOException {
+        test(ServerVersion.VERSION_21_0_0, HOST_XML, WFLY28_ROOT, EAP7_LOGGING, EAP8_EE);
+    }
+
     @Test
     public void discoverDomainXml_eap6() throws IOException {
         test(ServerVersion.VERSION_1_7_0, DOMAIN_XML, EAP6_ROOT, EAP6_LOGGING, EAP6_EE);
@@ -380,6 +391,11 @@ public void discoverDomainXml_wfly27() throws IOException {
         test(ServerVersion.VERSION_20_0_0, DOMAIN_XML, WFLY27_ROOT, EAP7_LOGGING, EAP8_EE);
     }
 
+    @Test
+    public void discoverDomainXml_wfly28() throws IOException {
+        test(ServerVersion.VERSION_21_0_0, DOMAIN_XML, WFLY28_ROOT, EAP7_LOGGING, EAP8_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
@@ -74,6 +74,9 @@
         <version.wildfly27>27.0.1.Final</version.wildfly27>
         <version.wildfly27.core>19.0.1.Final</version.wildfly27.core>
         <version.wildfly27.arquillian>5.0.0.Alpha5</version.wildfly27.arquillian>
+        <version.wildfly28>28.0.1.Final</version.wildfly28>
+        <version.wildfly28.core>20.0.2.Final</version.wildfly28.core>
+        <version.wildfly28.arquillian>5.0.0.Alpha6</version.wildfly28.arquillian>
 
 
         <managementPort.wildfly>9990</managementPort.wildfly>
@@ -207,6 +210,13 @@
         <wildfly27.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly27.arquillianContainer.artifactId>
         <wildfly27.arquillianContainer.version>${version.wildfly27.arquillian}</wildfly27.arquillianContainer.version>
 
+        <wildfly28.applicationServer.groupId>org.wildfly</wildfly28.applicationServer.groupId>
+        <wildfly28.applicationServer.artifactId>wildfly-dist</wildfly28.applicationServer.artifactId>
+        <wildfly28.applicationServer.version>${version.wildfly28}</wildfly28.applicationServer.version>
+        <wildfly28.arquillianContainer.groupId>org.wildfly.arquillian</wildfly28.arquillianContainer.groupId>
+        <wildfly28.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly28.arquillianContainer.artifactId>
+        <wildfly28.arquillianContainer.version>${version.wildfly28.arquillian}</wildfly28.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>
@@ -1203,10 +1213,6 @@
 
         <profile>
             <id>wildfly27</id>
-            <activation>
-                <!-- Note: WildFly 27 doesn't support JDK 1.8 anymore -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
 
             <properties>
                 <version.java>1.8</version.java>
@@ -1252,5 +1258,56 @@
             </dependencies>
         </profile>
 
+        <profile>
+            <id>wildfly28</id>
+            <activation>
+                <!-- Note: WildFly 27+ doesn't support JDK 1.8 anymore -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+            <properties>
+                <version.java>1.8</version.java>
+
+                <applicationServer.groupId>${wildfly28.applicationServer.groupId}</applicationServer.groupId>
+                <applicationServer.artifactId>${wildfly28.applicationServer.artifactId}</applicationServer.artifactId>
+                <applicationServer.version>${wildfly28.applicationServer.version}</applicationServer.version>
+                <applicationServer.managementPort>${managementPort.wildfly}</applicationServer.managementPort>
+
+                <arquillianContainer.groupId>${wildfly28.arquillianContainer.groupId}</arquillianContainer.groupId>
+                <arquillianContainer.artifactId>${wildfly28.arquillianContainer.artifactId}</arquillianContainer.artifactId>
+                <arquillianContainer.version>${wildfly28.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.wildfly28.core}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly.core</groupId>
+                    <artifactId>wildfly-cli</artifactId>
+                    <version>${version.wildfly28.core}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly.core</groupId>
+                    <artifactId>wildfly-patching</artifactId>
+                    <version>${version.wildfly28.core}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
     </profiles>
 </project>