add WildFly 30

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 2.0.3 (not yet released)
 
-- added support for WildFly 28 - 29
+- added support for WildFly 28 - 30
 
 ## 2.0.2 (2023-01-18)
 

README.md

@@ -542,6 +542,29 @@ Dependencies for `creaper-commands`:
         <version>21.1.1.Final</version>
     </dependency>
 
+#### WildFly 30 (30.0.1) (based on WildFly Core 22)
+
+Dependencies for `creaper-core`:
+
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-controller-client</artifactId>
+        <version>22.0.2.Final</version>
+    </dependency>
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-cli</artifactId>
+        <version>22.0.2.Final</version>
+    </dependency>
+
+Dependencies for `creaper-commands`:
+
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-patching</artifactId>
+        <version>22.0.2.Final</version>
+    </dependency>
+
 ### Transitive Dependencies
 
 These are the dependencies that you will get transitively when you depend

core/src/main/java/org/wildfly/extras/creaper/core/ServerVersion.java

@@ -102,6 +102,8 @@ public final class ServerVersion {
     public static final ServerVersion VERSION_21_0_0 = new ServerVersion(21, 0, 0);
     /** WF 29.0.x.Final */
     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);
 
     private static final ServerVersion[] KNOWN_VERSIONS = {
             VERSION_0_0_0,
@@ -137,7 +139,8 @@ public final class ServerVersion {
             VERSION_19_0_0,
             VERSION_20_0_0,
             VERSION_21_0_0,
-            VERSION_22_0_0
+            VERSION_22_0_0,
+            VERSION_23_0_0
     };
 
     /**

core/src/test/java/org/wildfly/extras/creaper/core/ServerVersionTest.java

@@ -45,6 +45,7 @@ public void referenceEquality() {
         assertSame(ServerVersion.VERSION_20_0_0, ServerVersion.from(20, 0, 0));
         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));
 
         assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
     }
@@ -85,6 +86,7 @@ public void equality() {
         assertSame(ServerVersion.VERSION_20_0_0, ServerVersion.from(20, 0, 0));
         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));
 
         assertEquals(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
     }

core/src/test/java/org/wildfly/extras/creaper/core/offline/OfflineServerVersionTest.java

@@ -68,6 +68,7 @@ public class OfflineServerVersionTest {
     private static final String WFLY27_ROOT = "20.0";
     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 COMMUNITY = "community";
     private static final String PREVIEW = "preview";
@@ -206,6 +207,11 @@ public void discoverStandaloneXml_wfly29() throws IOException {
         test(ServerVersion.VERSION_22_0_0, STANDALONE_XML, WFLY29_ROOT, EAP7_LOGGING, EAP8_EE);
     }
 
+    @Test
+    public void discoverStandaloneXml_wfly30() throws IOException {
+        test(ServerVersion.VERSION_23_0_0, STANDALONE_XML, WFLY30_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);
     }
@@ -327,6 +333,11 @@ public void discoverHostXml_wfly29() throws IOException {
         test(ServerVersion.VERSION_22_0_0, HOST_XML, WFLY29_ROOT, EAP7_LOGGING, EAP8_EE);
     }
 
+    @Test
+    public void discoverHostXml_wfly30() throws IOException {
+        test(ServerVersion.VERSION_23_0_0, HOST_XML, WFLY30_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);
     }
@@ -448,6 +459,11 @@ public void discoverDomainXml_wfly29() throws IOException {
         test(ServerVersion.VERSION_22_0_0, DOMAIN_XML, WFLY29_ROOT, EAP7_LOGGING, EAP8_EE);
     }
 
+    @Test
+    public void discoverDomainXml_wfly30() throws IOException {
+        test(ServerVersion.VERSION_23_0_0, DOMAIN_XML, WFLY30_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);
     }

testsuite/pom.xml

@@ -80,6 +80,9 @@
         <version.wildfly29>29.0.1.Final</version.wildfly29>
         <version.wildfly29.core>21.1.1.Final</version.wildfly29.core>
         <version.wildfly29.arquillian>5.0.0.Final</version.wildfly29.arquillian>
+        <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>
 
 
         <managementPort.wildfly>9990</managementPort.wildfly>
@@ -227,6 +230,13 @@
         <wildfly29.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly29.arquillianContainer.artifactId>
         <wildfly29.arquillianContainer.version>${version.wildfly29.arquillian}</wildfly29.arquillianContainer.version>
 
+        <wildfly30.applicationServer.groupId>org.wildfly</wildfly30.applicationServer.groupId>
+        <wildfly30.applicationServer.artifactId>wildfly-dist</wildfly30.applicationServer.artifactId>
+        <wildfly30.applicationServer.version>${version.wildfly30}</wildfly30.applicationServer.version>
+        <wildfly30.arquillianContainer.groupId>org.wildfly.arquillian</wildfly30.arquillianContainer.groupId>
+        <wildfly30.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly30.arquillianContainer.artifactId>
+        <wildfly30.arquillianContainer.version>${version.wildfly30.arquillian}</wildfly30.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>
@@ -427,8 +437,6 @@
             <id>wildfly10</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly10.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly10.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly10.applicationServer.version}</applicationServer.version>
@@ -473,8 +481,6 @@
             <id>wildfly11</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly11.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly11.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly11.applicationServer.version}</applicationServer.version>
@@ -520,8 +526,6 @@
             <id>wildfly12</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly12.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly12.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly12.applicationServer.version}</applicationServer.version>
@@ -567,8 +571,6 @@
             <id>wildfly13</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly13.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly13.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly13.applicationServer.version}</applicationServer.version>
@@ -614,8 +616,6 @@
             <id>wildfly14</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly14.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly14.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly14.applicationServer.version}</applicationServer.version>
@@ -661,8 +661,6 @@
             <id>wildfly15</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly15.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly15.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly15.applicationServer.version}</applicationServer.version>
@@ -708,8 +706,6 @@
             <id>wildfly16</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly16.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly16.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly16.applicationServer.version}</applicationServer.version>
@@ -755,8 +751,6 @@
             <id>wildfly17</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly17.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly17.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly17.applicationServer.version}</applicationServer.version>
@@ -802,8 +796,6 @@
             <id>wildfly18</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly18.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly18.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly18.applicationServer.version}</applicationServer.version>
@@ -849,8 +841,6 @@
             <id>wildfly19</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly19.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly19.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly19.applicationServer.version}</applicationServer.version>
@@ -896,8 +886,6 @@
             <id>wildfly20</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly20.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly20.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly20.applicationServer.version}</applicationServer.version>
@@ -943,8 +931,6 @@
             <id>wildfly21</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly21.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly21.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly21.applicationServer.version}</applicationServer.version>
@@ -990,8 +976,6 @@
             <id>wildfly22</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly22.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly22.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly22.applicationServer.version}</applicationServer.version>
@@ -1037,8 +1021,6 @@
             <id>wildfly23</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly23.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly23.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly23.applicationServer.version}</applicationServer.version>
@@ -1084,8 +1066,6 @@
             <id>wildfly24</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly24.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly24.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly24.applicationServer.version}</applicationServer.version>
@@ -1131,8 +1111,6 @@
             <id>wildfly25</id>
 
             <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>
@@ -1178,8 +1156,6 @@
             <id>wildfly26</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly26.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly26.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly26.applicationServer.version}</applicationServer.version>
@@ -1225,8 +1201,6 @@
             <id>wildfly27</id>
 
             <properties>
-                <version.java>1.8</version.java>
-
                 <applicationServer.groupId>${wildfly27.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly27.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly27.applicationServer.version}</applicationServer.version>
@@ -1272,8 +1246,6 @@
             <id>wildfly28</id>
 
             <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>
@@ -1317,14 +1289,8 @@
 
         <profile>
             <id>wildfly29</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>${wildfly29.applicationServer.groupId}</applicationServer.groupId>
                 <applicationServer.artifactId>${wildfly29.applicationServer.artifactId}</applicationServer.artifactId>
                 <applicationServer.version>${wildfly29.applicationServer.version}</applicationServer.version>
@@ -1366,5 +1332,54 @@
             </dependencies>
         </profile>
 
+        <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>
+                <applicationServer.artifactId>${wildfly30.applicationServer.artifactId}</applicationServer.artifactId>
+                <applicationServer.version>${wildfly30.applicationServer.version}</applicationServer.version>
+                <applicationServer.managementPort>${managementPort.wildfly}</applicationServer.managementPort>
+
+                <arquillianContainer.groupId>${wildfly30.arquillianContainer.groupId}</arquillianContainer.groupId>
+                <arquillianContainer.artifactId>${wildfly30.arquillianContainer.artifactId}</arquillianContainer.artifactId>
+                <arquillianContainer.version>${wildfly30.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.wildfly30.core}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly.core</groupId>
+                    <artifactId>wildfly-cli</artifactId>
+                    <version>${version.wildfly30.core}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly.core</groupId>
+                    <artifactId>wildfly-patching</artifactId>
+                    <version>${version.wildfly30.core}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
     </profiles>
 </project>