add WildFly 34

wildfly-extras · Jan 2, 2025 · a1811c3 · a1811c3
1 parent 5e83615
commit a1811c3
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 2.0.4 (not yet released)
 
+- added support for WildFly 34
+
 ## 2.0.3 (2024-09-16)
 
 - added support for WildFly 28 - 33

diff --git a/README.md b/README.md
@@ -634,6 +634,29 @@ Dependencies for `creaper-commands`:
         <version>25.0.1.Final</version>
     </dependency>
 
+#### WildFly 34 (34.0.1) (based on WildFly Core 26)
+
+Dependencies for `creaper-core`:
+
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-controller-client</artifactId>
+        <version>26.0.1.Final</version>
+    </dependency>
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-cli</artifactId>
+        <version>26.0.1.Final</version>
+    </dependency>
+
+Dependencies for `creaper-commands`:
+
+    <dependency>
+        <groupId>org.wildfly.core</groupId>
+        <artifactId>wildfly-patching</artifactId>
+        <version>26.0.1.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
@@ -110,6 +110,8 @@ public final class ServerVersion {
     public static final ServerVersion VERSION_25_0_0 = new ServerVersion(25, 0, 0);
     /** WF 33.0.x.Final */
     public static final ServerVersion VERSION_26_0_0 = new ServerVersion(26, 0, 0);
+    /** WF 34.0.x.Final */
+    public static final ServerVersion VERSION_27_0_0 = new ServerVersion(27, 0, 0);
 
     private static final ServerVersion[] KNOWN_VERSIONS = {
             VERSION_0_0_0,
@@ -149,7 +151,8 @@ public final class ServerVersion {
             VERSION_23_0_0,
             VERSION_24_0_0,
             VERSION_25_0_0,
-            VERSION_26_0_0
+            VERSION_26_0_0,
+            VERSION_27_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
@@ -49,6 +49,7 @@ public void referenceEquality() {
         assertSame(ServerVersion.VERSION_24_0_0, ServerVersion.from(24, 0, 0));
         assertSame(ServerVersion.VERSION_25_0_0, ServerVersion.from(25, 0, 0));
         assertSame(ServerVersion.VERSION_26_0_0, ServerVersion.from(26, 0, 0));
+        assertSame(ServerVersion.VERSION_27_0_0, ServerVersion.from(27, 0, 0));
 
         assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
     }
@@ -93,6 +94,7 @@ public void equality() {
         assertSame(ServerVersion.VERSION_24_0_0, ServerVersion.from(24, 0, 0));
         assertSame(ServerVersion.VERSION_25_0_0, ServerVersion.from(25, 0, 0));
         assertSame(ServerVersion.VERSION_26_0_0, ServerVersion.from(26, 0, 0));
+        assertSame(ServerVersion.VERSION_27_0_0, ServerVersion.from(27, 0, 0));
 
         assertEquals(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
     }

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -92,6 +92,9 @@
         <version.wildfly33>33.0.1.Final</version.wildfly33>
         <version.wildfly33.core>25.0.1.Final</version.wildfly33.core>
         <version.wildfly33.arquillian>5.1.0.Beta4</version.wildfly33.arquillian>
+        <version.wildfly34>34.0.1.Final</version.wildfly34>
+        <version.wildfly34.core>26.0.1.Final</version.wildfly34.core>
+        <version.wildfly34.arquillian>5.1.0.Beta6</version.wildfly34.arquillian>
 
 
         <managementPort.wildfly>9990</managementPort.wildfly>
@@ -267,6 +270,13 @@
         <wildfly33.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly33.arquillianContainer.artifactId>
         <wildfly33.arquillianContainer.version>${version.wildfly33.arquillian}</wildfly33.arquillianContainer.version>
 
+        <wildfly34.applicationServer.groupId>org.wildfly</wildfly34.applicationServer.groupId>
+        <wildfly34.applicationServer.artifactId>wildfly-dist</wildfly34.applicationServer.artifactId>
+        <wildfly34.applicationServer.version>${version.wildfly34}</wildfly34.applicationServer.version>
+        <wildfly34.arquillianContainer.groupId>org.wildfly.arquillian</wildfly34.arquillianContainer.groupId>
+        <wildfly34.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly34.arquillianContainer.artifactId>
+        <wildfly34.arquillianContainer.version>${version.wildfly34.arquillian}</wildfly34.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>
@@ -1499,10 +1509,6 @@
 
         <profile>
             <id>wildfly33</id>
-            <activation>
-                <!-- Note: WildFly 27+ doesn't support JDK 1.8 anymore -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
 
             <properties>
                 <applicationServer.groupId>${wildfly33.applicationServer.groupId}</applicationServer.groupId>
@@ -1546,5 +1552,54 @@
             </dependencies>
         </profile>
 
+        <profile>
+            <id>wildfly34</id>
+            <activation>
+                <!-- Note: WildFly 27+ doesn't support JDK 1.8 anymore -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+            <properties>
+                <applicationServer.groupId>${wildfly34.applicationServer.groupId}</applicationServer.groupId>
+                <applicationServer.artifactId>${wildfly34.applicationServer.artifactId}</applicationServer.artifactId>
+                <applicationServer.version>${wildfly34.applicationServer.version}</applicationServer.version>
+                <applicationServer.managementPort>${managementPort.wildfly}</applicationServer.managementPort>
+
+                <arquillianContainer.groupId>${wildfly34.arquillianContainer.groupId}</arquillianContainer.groupId>
+                <arquillianContainer.artifactId>${wildfly34.arquillianContainer.artifactId}</arquillianContainer.artifactId>
+                <arquillianContainer.version>${wildfly34.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.wildfly34.core}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly.core</groupId>
+                    <artifactId>wildfly-cli</artifactId>
+                    <version>${version.wildfly34.core}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly.core</groupId>
+                    <artifactId>wildfly-patching</artifactId>
+                    <version>${version.wildfly34.core}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
     </profiles>
 </project>