diff --git a/CHANGELOG.md b/CHANGELOG.md index f315094f..c03119ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 2.0.3 (not yet released) -- added support for WildFly 28 +- added support for WildFly 28 - 29 ## 2.0.2 (2023-01-18) diff --git a/README.md b/README.md index 8a7f8557..0a5d2871 100644 --- a/README.md +++ b/README.md @@ -519,6 +519,29 @@ Dependencies for `creaper-commands`: 20.0.2.Final +#### WildFly 29 (29.0.1) (based on WildFly Core 21) + +Dependencies for `creaper-core`: + + + org.wildfly.core + wildfly-controller-client + 21.1.1.Final + + + org.wildfly.core + wildfly-cli + 21.1.1.Final + + +Dependencies for `creaper-commands`: + + + org.wildfly.core + wildfly-patching + 21.1.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 2ac2582f..30272080 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 @@ -100,6 +100,8 @@ public final class ServerVersion { public static final ServerVersion VERSION_20_0_0 = new ServerVersion(20, 0, 0); /** WF 28.0.x.Final */ public static final ServerVersion VERSION_21_0_0 = new ServerVersion(21, 0, 0); + /** WF 29.0.x.Final */ + public static final ServerVersion VERSION_22_0_0 = new ServerVersion(22, 0, 0); private static final ServerVersion[] KNOWN_VERSIONS = { VERSION_0_0_0, @@ -134,7 +136,8 @@ public final class ServerVersion { VERSION_18_0_0, VERSION_19_0_0, VERSION_20_0_0, - VERSION_21_0_0 + VERSION_21_0_0, + VERSION_22_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 843f9e99..2a90a273 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 @@ -44,6 +44,7 @@ public void referenceEquality() { assertSame(ServerVersion.VERSION_19_0_0, ServerVersion.from(19, 0, 0)); assertSame(ServerVersion.VERSION_20_0_0, ServerVersion.from(20, 0, 0)); assertSame(ServerVersion.VERSION_21_0_0, ServerVersion.from(21, 0, 0)); + assertSame(ServerVersion.VERSION_22_0_0, ServerVersion.from(22, 0, 0)); assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42)); } @@ -83,6 +84,7 @@ public void equality() { assertSame(ServerVersion.VERSION_19_0_0, ServerVersion.from(19, 0, 0)); assertSame(ServerVersion.VERSION_20_0_0, ServerVersion.from(20, 0, 0)); assertSame(ServerVersion.VERSION_21_0_0, ServerVersion.from(21, 0, 0)); + assertSame(ServerVersion.VERSION_22_0_0, ServerVersion.from(22, 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 293ce70d..5a02266c 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 @@ -67,6 +67,7 @@ public class OfflineServerVersionTest { private static final String WFLY26_ROOT = "19.0"; private static final String WFLY27_ROOT = "20.0"; private static final String WFLY28_ROOT = "21.0"; + private static final String WFLY29_ROOT = "22.0"; @Rule public final TemporaryFolder tmp = new TemporaryFolder(); @@ -196,6 +197,11 @@ public void discoverStandaloneXml_wfly28() throws IOException { test(ServerVersion.VERSION_21_0_0, STANDALONE_XML, WFLY28_ROOT, EAP7_LOGGING, EAP8_EE); } + @Test + public void discoverStandaloneXml_wfly29() throws IOException { + test(ServerVersion.VERSION_22_0_0, STANDALONE_XML, WFLY29_ROOT, EAP7_LOGGING, EAP8_EE); + } + @Test public void discoverHostXml_eap6() throws IOException { test(ServerVersion.VERSION_1_7_0, HOST_XML, EAP6_ROOT, EAP6_LOGGING, EAP6_EE); @@ -296,6 +302,11 @@ public void discoverHostXml_wfly28() throws IOException { test(ServerVersion.VERSION_21_0_0, HOST_XML, WFLY28_ROOT, EAP7_LOGGING, EAP8_EE); } + @Test + public void discoverHostXml_wfly29() throws IOException { + test(ServerVersion.VERSION_22_0_0, HOST_XML, WFLY29_ROOT, EAP7_LOGGING, EAP8_EE); + } + @Test public void discoverDomainXml_eap6() throws IOException { test(ServerVersion.VERSION_1_7_0, DOMAIN_XML, EAP6_ROOT, EAP6_LOGGING, EAP6_EE); @@ -396,6 +407,11 @@ public void discoverDomainXml_wfly28() throws IOException { test(ServerVersion.VERSION_21_0_0, DOMAIN_XML, WFLY28_ROOT, EAP7_LOGGING, EAP8_EE); } + @Test + public void discoverDomainXml_wfly29() throws IOException { + test(ServerVersion.VERSION_22_0_0, DOMAIN_XML, WFLY29_ROOT, EAP7_LOGGING, EAP8_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 05806da4..274e5f0c 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -77,6 +77,9 @@ 28.0.1.Final 20.0.2.Final 5.0.0.Alpha6 + 29.0.1.Final + 21.1.1.Final + 5.0.0.Final 9990 @@ -217,6 +220,13 @@ wildfly-arquillian-container-managed ${version.wildfly28.arquillian} + org.wildfly + wildfly-dist + ${version.wildfly29} + org.wildfly.arquillian + wildfly-arquillian-container-managed + ${version.wildfly29.arquillian} + MUST-BE-DEFINED @@ -1260,10 +1270,6 @@ wildfly28 - - - true - 1.8 @@ -1309,5 +1315,56 @@ + + wildfly29 + + + true + + + + 1.8 + + ${wildfly29.applicationServer.groupId} + ${wildfly29.applicationServer.artifactId} + ${wildfly29.applicationServer.version} + ${managementPort.wildfly} + + ${wildfly29.arquillianContainer.groupId} + ${wildfly29.arquillianContainer.artifactId} + ${wildfly29.arquillianContainer.version} + + ${ignoredCategory.wildfly11} + + + + + + org.wildfly.extras.creaper + creaper-core + + + org.wildfly.extras.creaper + creaper-commands + + + + org.wildfly.core + wildfly-controller-client + ${version.wildfly29.core} + + + org.wildfly.core + wildfly-cli + ${version.wildfly29.core} + + + org.wildfly.core + wildfly-patching + ${version.wildfly29.core} + + + +