From b8f890df91d17215d0df3a17632398b843ee0e97 Mon Sep 17 00:00:00 2001 From: Martin Simka Date: Thu, 16 Jun 2022 12:35:56 +0200 Subject: [PATCH] add WildFly 24 --- README.md | 23 +++++++ .../extras/creaper/core/ServerVersion.java | 5 +- .../creaper/core/ServerVersionTest.java | 2 + .../offline/OfflineServerVersionTest.java | 16 +++++ testsuite/pom.xml | 63 ++++++++++++++++++- 5 files changed, 105 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e19bf9f6..66548976 100644 --- a/README.md +++ b/README.md @@ -404,6 +404,29 @@ Dependencies for `creaper-commands`: 15.0.1.Final +#### WildFly 24 (24.0.1) (based on WildFly Core 16) + +Dependencies for `creaper-core`: + + + org.wildfly.core + wildfly-controller-client + 16.0.1.Final + + + org.wildfly.core + wildfly-cli + 16.0.1.Final + + +Dependencies for `creaper-commands`: + + + org.wildfly.core + wildfly-patching + 16.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 9714d177..00fdc52c 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 @@ -90,6 +90,8 @@ public final class ServerVersion { public static final ServerVersion VERSION_15_0_0 = new ServerVersion(15, 0, 0); /** WF 23.0.x.Final */ 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); private static final ServerVersion[] KNOWN_VERSIONS = { VERSION_0_0_0, @@ -119,7 +121,8 @@ public final class ServerVersion { VERSION_13_0_0, VERSION_14_0_0, VERSION_15_0_0, - VERSION_16_0_0 + VERSION_16_0_0, + VERSION_17_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 571c31f5..0659bb6f 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 @@ -39,6 +39,7 @@ public void referenceEquality() { assertSame(ServerVersion.VERSION_14_0_0, ServerVersion.from(14, 0, 0)); 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)); assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42)); } @@ -73,6 +74,7 @@ public void equality() { assertSame(ServerVersion.VERSION_14_0_0, ServerVersion.from(14, 0, 0)); 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)); 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 9b1f8cc5..4554283b 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 @@ -60,6 +60,7 @@ public class OfflineServerVersionTest { private static final String WFLY21_ROOT = "14.0"; private static final String WFLY22_ROOT = "15.0"; private static final String WFLY23_ROOT = "16.0"; + private static final String WFLY24_ROOT = "17.0"; @Rule public final TemporaryFolder tmp = new TemporaryFolder(); @@ -164,6 +165,11 @@ public void discoverStandaloneXml_wfly23() throws IOException { test(ServerVersion.VERSION_16_0_0, STANDALONE_XML, WFLY23_ROOT, EAP7_LOGGING, EAP7_EE); } + @Test + public void discoverStandaloneXml_wfly24() throws IOException { + test(ServerVersion.VERSION_17_0_0, STANDALONE_XML, WFLY24_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); @@ -239,6 +245,11 @@ public void discoverHostXml_wfly23() throws IOException { test(ServerVersion.VERSION_16_0_0, HOST_XML, WFLY23_ROOT, EAP7_LOGGING, EAP7_EE); } + @Test + public void discoverHostXml_wfly24() throws IOException { + test(ServerVersion.VERSION_17_0_0, HOST_XML, WFLY24_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); @@ -314,6 +325,11 @@ public void discoverDomainXml_wfly23() throws IOException { test(ServerVersion.VERSION_16_0_0, DOMAIN_XML, WFLY23_ROOT, EAP7_LOGGING, EAP7_EE); } + @Test + public void discoverDomainXml_wfly24() throws IOException { + test(ServerVersion.VERSION_17_0_0, DOMAIN_XML, WFLY24_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 fb1b6b8d..e3a9c474 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -62,6 +62,9 @@ 23.0.2.Final 15.0.1.Final 3.0.1.Final + 24.0.1.Final + 16.0.1.Final + 3.0.1.Final 9990 @@ -169,6 +172,13 @@ wildfly-arquillian-container-managed ${version.wildfly23.arquillian} + org.wildfly + wildfly-dist + ${version.wildfly24} + org.wildfly.arquillian + wildfly-arquillian-container-managed + ${version.wildfly24.arquillian} + MUST-BE-DEFINED @@ -977,9 +987,6 @@ wildfly23 - - true - 1.8 @@ -1025,5 +1032,55 @@ + + wildfly24 + + true + + + + 1.8 + + ${wildfly24.applicationServer.groupId} + ${wildfly24.applicationServer.artifactId} + ${wildfly24.applicationServer.version} + ${managementPort.wildfly} + + ${wildfly24.arquillianContainer.groupId} + ${wildfly24.arquillianContainer.artifactId} + ${wildfly24.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.wildfly24.core} + + + org.wildfly.core + wildfly-cli + ${version.wildfly24.core} + + + org.wildfly.core + wildfly-patching + ${version.wildfly24.core} + + + +