diff --git a/README.md b/README.md index 66548976..d60a8ba5 100644 --- a/README.md +++ b/README.md @@ -427,6 +427,29 @@ Dependencies for `creaper-commands`: 16.0.1.Final +#### WildFly 25 (25.0.1) (based on WildFly Core 17) + +Dependencies for `creaper-core`: + + + org.wildfly.core + wildfly-controller-client + 17.0.3.Final + + + org.wildfly.core + wildfly-cli + 17.0.3.Final + + +Dependencies for `creaper-commands`: + + + org.wildfly.core + wildfly-patching + 17.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 00fdc52c..9e57b12c 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 @@ -92,6 +92,8 @@ public final class ServerVersion { public static final ServerVersion VERSION_16_0_0 = new ServerVersion(16, 0, 0); /** WF 24.0.x.Final */ public static final ServerVersion VERSION_17_0_0 = new ServerVersion(17, 0, 0); + /** WF 25.0.x.Final */ + public static final ServerVersion VERSION_18_0_0 = new ServerVersion(18, 0, 0); private static final ServerVersion[] KNOWN_VERSIONS = { VERSION_0_0_0, @@ -122,7 +124,8 @@ public final class ServerVersion { VERSION_14_0_0, VERSION_15_0_0, VERSION_16_0_0, - VERSION_17_0_0 + VERSION_17_0_0, + VERSION_18_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 0659bb6f..da046dbc 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 @@ -40,6 +40,7 @@ public void referenceEquality() { assertSame(ServerVersion.VERSION_15_0_0, ServerVersion.from(15, 0, 0)); assertSame(ServerVersion.VERSION_16_0_0, ServerVersion.from(16, 0, 0)); assertSame(ServerVersion.VERSION_17_0_0, ServerVersion.from(17, 0, 0)); + assertSame(ServerVersion.VERSION_18_0_0, ServerVersion.from(18, 0, 0)); assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42)); } @@ -75,6 +76,7 @@ public void equality() { assertSame(ServerVersion.VERSION_15_0_0, ServerVersion.from(15, 0, 0)); assertSame(ServerVersion.VERSION_16_0_0, ServerVersion.from(16, 0, 0)); assertSame(ServerVersion.VERSION_17_0_0, ServerVersion.from(17, 0, 0)); + assertSame(ServerVersion.VERSION_18_0_0, ServerVersion.from(18, 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 4554283b..96deff53 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 @@ -61,6 +61,7 @@ public class OfflineServerVersionTest { private static final String WFLY22_ROOT = "15.0"; private static final String WFLY23_ROOT = "16.0"; private static final String WFLY24_ROOT = "17.0"; + private static final String WFLY25_ROOT = "18.0"; @Rule public final TemporaryFolder tmp = new TemporaryFolder(); @@ -170,6 +171,11 @@ public void discoverStandaloneXml_wfly24() throws IOException { test(ServerVersion.VERSION_17_0_0, STANDALONE_XML, WFLY24_ROOT, EAP7_LOGGING, EAP7_EE); } + @Test + public void discoverStandaloneXml_wfly25() throws IOException { + test(ServerVersion.VERSION_18_0_0, STANDALONE_XML, WFLY25_ROOT, EAP7_LOGGING, EAP7_EE); + } + @Test public void discoverHostXml_eap6() throws IOException { test(ServerVersion.VERSION_1_7_0, HOST_XML, EAP6_ROOT, EAP6_LOGGING, EAP6_EE); @@ -250,6 +256,11 @@ public void discoverHostXml_wfly24() throws IOException { test(ServerVersion.VERSION_17_0_0, HOST_XML, WFLY24_ROOT, EAP7_LOGGING, EAP7_EE); } + @Test + public void discoverHostXml_wfly25() throws IOException { + test(ServerVersion.VERSION_18_0_0, HOST_XML, WFLY25_ROOT, EAP7_LOGGING, EAP7_EE); + } + @Test public void discoverDomainXml_eap6() throws IOException { test(ServerVersion.VERSION_1_7_0, DOMAIN_XML, EAP6_ROOT, EAP6_LOGGING, EAP6_EE); @@ -330,6 +341,11 @@ public void discoverDomainXml_wfly24() throws IOException { test(ServerVersion.VERSION_17_0_0, DOMAIN_XML, WFLY24_ROOT, EAP7_LOGGING, EAP7_EE); } + @Test + public void discoverDomainXml_wfly25() throws IOException { + test(ServerVersion.VERSION_18_0_0, DOMAIN_XML, WFLY25_ROOT, EAP7_LOGGING, EAP7_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 index e3a9c474..0b939f4c 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -65,6 +65,9 @@ 24.0.1.Final 16.0.1.Final 3.0.1.Final + 25.0.1.Final + 17.0.3.Final + 3.0.1.Final 9990 @@ -179,6 +182,13 @@ wildfly-arquillian-container-managed ${version.wildfly24.arquillian} + org.wildfly + wildfly-dist + ${version.wildfly25} + org.wildfly.arquillian + wildfly-arquillian-container-managed + ${version.wildfly25.arquillian} + MUST-BE-DEFINED @@ -1034,9 +1044,6 @@ wildfly24 - - true - 1.8 @@ -1082,5 +1089,55 @@ + + wildfly25 + + true + + + + 1.8 + + ${wildfly25.applicationServer.groupId} + ${wildfly25.applicationServer.artifactId} + ${wildfly25.applicationServer.version} + ${managementPort.wildfly} + + ${wildfly25.arquillianContainer.groupId} + ${wildfly25.arquillianContainer.artifactId} + ${wildfly25.arquillianContainer.version} + + ${ignoredCategory.wildfly11} + ${specialJvmArgs.wildfly} + + + + + org.wildfly.extras.creaper + creaper-core + + + org.wildfly.extras.creaper + creaper-commands + + + + org.wildfly.core + wildfly-controller-client + ${version.wildfly25.core} + + + org.wildfly.core + wildfly-cli + ${version.wildfly25.core} + + + org.wildfly.core + wildfly-patching + ${version.wildfly25.core} + + + +