diff --git a/README.md b/README.md index e80827c7..5f423729 100644 --- a/README.md +++ b/README.md @@ -588,6 +588,29 @@ Dependencies for `creaper-commands`: 23.0.3.Final +#### WildFly 32 (32.0.1) (based on WildFly Core 24) + +Dependencies for `creaper-core`: + + + org.wildfly.core + wildfly-controller-client + 24.0.1.Final + + + org.wildfly.core + wildfly-cli + 24.0.1.Final + + +Dependencies for `creaper-commands`: + + + org.wildfly.core + wildfly-patching + 24.0.1.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 e9cd7fc3..173fac23 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 @@ -106,6 +106,8 @@ public final class ServerVersion { 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); + /** WF 32.0.x.Final */ + public static final ServerVersion VERSION_25_0_0 = new ServerVersion(25, 0, 0); private static final ServerVersion[] KNOWN_VERSIONS = { VERSION_0_0_0, @@ -143,7 +145,8 @@ public final class ServerVersion { VERSION_21_0_0, VERSION_22_0_0, VERSION_23_0_0, - VERSION_24_0_0 + VERSION_24_0_0, + VERSION_25_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 d0a221c1..ddf070b8 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 @@ -47,6 +47,7 @@ public void referenceEquality() { 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)); + assertSame(ServerVersion.VERSION_25_0_0, ServerVersion.from(25, 0, 0)); assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42)); } @@ -89,6 +90,7 @@ public void equality() { 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)); + assertSame(ServerVersion.VERSION_25_0_0, ServerVersion.from(25, 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 609ec535..d7023e62 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 @@ -70,6 +70,7 @@ public class OfflineServerVersionTest { 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 WFLY32_ROOT = "25.0"; private static final String COMMUNITY = "community"; private static final String PREVIEW = "preview"; @@ -218,6 +219,11 @@ public void discoverStandaloneXml_wfly31() throws IOException { test(ServerVersion.VERSION_24_0_0, STANDALONE_XML, WFLY31_ROOT, EAP7_LOGGING, EAP8_EE); } + @Test + public void discoverStandaloneXml_wfly32() throws IOException { + test(ServerVersion.VERSION_25_0_0, STANDALONE_XML, WFLY32_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); } @@ -349,6 +355,11 @@ public void discoverHostXml_wfly31() throws IOException { test(ServerVersion.VERSION_24_0_0, HOST_XML, WFLY31_ROOT, EAP7_LOGGING, EAP8_EE); } + @Test + public void discoverHostXml_wfly32() throws IOException { + test(ServerVersion.VERSION_25_0_0, HOST_XML, WFLY32_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); } @@ -480,6 +491,11 @@ public void discoverDomainXml_wfly31() throws IOException { test(ServerVersion.VERSION_24_0_0, DOMAIN_XML, WFLY31_ROOT, EAP7_LOGGING, EAP8_EE); } + @Test + public void discoverDomainXml_wfly32() throws IOException { + test(ServerVersion.VERSION_25_0_0, DOMAIN_XML, WFLY32_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 01beef80..1d803b43 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -86,6 +86,9 @@ 31.0.1.Final 23.0.3.Final 5.0.1.Final + 32.0.1.Final + 24.0.1.Final + 5.0.1.Final 9990 @@ -247,6 +250,13 @@ wildfly-arquillian-container-managed ${version.wildfly31.arquillian} + org.wildfly + wildfly-dist + ${version.wildfly32} + org.wildfly.arquillian + wildfly-arquillian-container-managed + ${version.wildfly32.arquillian} + MUST-BE-DEFINED @@ -1389,10 +1399,6 @@ wildfly31 - - - true - ${wildfly31.applicationServer.groupId} @@ -1436,5 +1442,54 @@ + + wildfly32 + + + true + + + + ${wildfly32.applicationServer.groupId} + ${wildfly32.applicationServer.artifactId} + ${wildfly32.applicationServer.version} + ${managementPort.wildfly} + + ${wildfly32.arquillianContainer.groupId} + ${wildfly32.arquillianContainer.artifactId} + ${wildfly32.arquillianContainer.version} + + ${ignoredCategory.wildfly11} + + + + + + org.wildfly.extras.creaper + creaper-core + + + org.wildfly.extras.creaper + creaper-commands + + + + org.wildfly.core + wildfly-controller-client + ${version.wildfly32.core} + + + org.wildfly.core + wildfly-cli + ${version.wildfly32.core} + + + org.wildfly.core + wildfly-patching + ${version.wildfly32.core} + + + +