diff --git a/README.md b/README.md index b148d095..e80827c7 100644 --- a/README.md +++ b/README.md @@ -565,6 +565,29 @@ Dependencies for `creaper-commands`: 22.0.2.Final +#### WildFly 31 (31.0.1) (based on WildFly Core 23) + +Dependencies for `creaper-core`: + + + org.wildfly.core + wildfly-controller-client + 23.0.3.Final + + + org.wildfly.core + wildfly-cli + 23.0.3.Final + + +Dependencies for `creaper-commands`: + + + org.wildfly.core + wildfly-patching + 23.0.3.Final + + ### 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 index 9db6d7d3..e9cd7fc3 100644 --- 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 index 4823703f..d0a221c1 100644 --- 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 index fb0508bc..609ec535 100644 --- 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 index cd92b56a..01beef80 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -83,6 +83,9 @@ 30.0.1.Final 22.0.2.Final 5.0.1.Final + 31.0.1.Final + 23.0.3.Final + 5.0.1.Final 9990 @@ -237,6 +240,13 @@ wildfly-arquillian-container-managed ${version.wildfly30.arquillian} + org.wildfly + wildfly-dist + ${version.wildfly31} + org.wildfly.arquillian + wildfly-arquillian-container-managed + ${version.wildfly31.arquillian} + MUST-BE-DEFINED @@ -1334,10 +1344,6 @@ wildfly30 - - - true - ${wildfly30.applicationServer.groupId} @@ -1381,5 +1387,54 @@ + + wildfly31 + + + true + + + + ${wildfly31.applicationServer.groupId} + ${wildfly31.applicationServer.artifactId} + ${wildfly31.applicationServer.version} + ${managementPort.wildfly} + + ${wildfly31.arquillianContainer.groupId} + ${wildfly31.arquillianContainer.artifactId} + ${wildfly31.arquillianContainer.version} + + ${ignoredCategory.wildfly11} + + + + + + org.wildfly.extras.creaper + creaper-core + + + org.wildfly.extras.creaper + creaper-commands + + + + org.wildfly.core + wildfly-controller-client + ${version.wildfly31.core} + + + org.wildfly.core + wildfly-cli + ${version.wildfly31.core} + + + org.wildfly.core + wildfly-patching + ${version.wildfly31.core} + + + +