From 84fb762073268fda9d727524cb2bc8f3ad39c87f Mon Sep 17 00:00:00 2001 From: Martin Simka Date: Thu, 16 Jun 2022 12:16:07 +0200 Subject: [PATCH] add WildFly 22 --- 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 870c8aa1..9745fa3d 100644 --- a/README.md +++ b/README.md @@ -358,6 +358,29 @@ Dependencies for `creaper-commands`: 13.0.3.Final +#### WildFly 22 (22.0.1) (based on WildFly Core 14) + +Dependencies for `creaper-core`: + + + org.wildfly.core + wildfly-controller-client + 14.0.1.Final + + + org.wildfly.core + wildfly-cli + 14.0.1.Final + + +Dependencies for `creaper-commands`: + + + org.wildfly.core + wildfly-patching + 14.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 7af66cee..b0e347e5 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 @@ -86,6 +86,8 @@ public final class ServerVersion { public static final ServerVersion VERSION_13_0_0 = new ServerVersion(13, 0, 0); /** WF 21.0.x.Final */ public static final ServerVersion VERSION_14_0_0 = new ServerVersion(14, 0, 0); + /** WF 22.0.x.Final */ + public static final ServerVersion VERSION_15_0_0 = new ServerVersion(15, 0, 0); private static final ServerVersion[] KNOWN_VERSIONS = { VERSION_0_0_0, @@ -113,7 +115,8 @@ public final class ServerVersion { VERSION_10_0_0, VERSION_12_0_0, VERSION_13_0_0, - VERSION_14_0_0 + VERSION_14_0_0, + VERSION_15_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 a47478c6..ea47e038 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 @@ -37,6 +37,7 @@ public void referenceEquality() { assertSame(ServerVersion.VERSION_12_0_0, ServerVersion.from(12, 0, 0)); assertSame(ServerVersion.VERSION_13_0_0, ServerVersion.from(13, 0, 0)); assertSame(ServerVersion.VERSION_14_0_0, ServerVersion.from(14, 0, 0)); + assertSame(ServerVersion.VERSION_15_0_0, ServerVersion.from(15, 0, 0)); assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42)); } @@ -69,6 +70,7 @@ public void equality() { assertEquals(ServerVersion.VERSION_12_0_0, ServerVersion.from(12, 0, 0)); assertEquals(ServerVersion.VERSION_13_0_0, ServerVersion.from(13, 0, 0)); assertSame(ServerVersion.VERSION_14_0_0, ServerVersion.from(14, 0, 0)); + assertSame(ServerVersion.VERSION_15_0_0, ServerVersion.from(15, 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 d90ac315..292bccb9 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 @@ -58,6 +58,7 @@ public class OfflineServerVersionTest { private static final String WFLY19_ROOT = "12.0"; private static final String WFLY20_ROOT = "13.0"; private static final String WFLY21_ROOT = "14.0"; + private static final String WFLY22_ROOT = "15.0"; @Rule public final TemporaryFolder tmp = new TemporaryFolder(); @@ -152,6 +153,11 @@ public void discoverStandaloneXml_wfly21() throws IOException { test(ServerVersion.VERSION_14_0_0, STANDALONE_XML, WFLY21_ROOT, EAP7_LOGGING, EAP7_EE); } + @Test + public void discoverStandaloneXml_wfly22() throws IOException { + test(ServerVersion.VERSION_15_0_0, STANDALONE_XML, WFLY22_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); @@ -217,6 +223,11 @@ public void discoverHostXml_wfly21() throws IOException { test(ServerVersion.VERSION_14_0_0, HOST_XML, WFLY21_ROOT, EAP7_LOGGING, EAP7_EE); } + @Test + public void discoverHostXml_wfly22() throws IOException { + test(ServerVersion.VERSION_15_0_0, HOST_XML, WFLY22_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); @@ -282,6 +293,11 @@ public void discoverDomainXml_wfly21() throws IOException { test(ServerVersion.VERSION_14_0_0, DOMAIN_XML, WFLY21_ROOT, EAP7_LOGGING, EAP7_EE); } + @Test + public void discoverDomainXml_wfly22() throws IOException { + test(ServerVersion.VERSION_15_0_0, DOMAIN_XML, WFLY22_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 2fd8c40a..0b496181 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -56,6 +56,9 @@ 21.0.2.Final 13.0.3.Final 2.2.0.Final + 22.0.1.Final + 14.0.1.Final + 3.0.1.Final 9990 @@ -149,6 +152,13 @@ wildfly-arquillian-container-managed ${version.wildfly21.arquillian} + org.wildfly + wildfly-dist + ${version.wildfly22} + org.wildfly.arquillian + wildfly-arquillian-container-managed + ${version.wildfly22.arquillian} + MUST-BE-DEFINED @@ -863,9 +873,6 @@ wildfly21 - - true - 1.8 @@ -911,5 +918,55 @@ + + wildfly22 + + true + + + + 1.8 + + ${wildfly22.applicationServer.groupId} + ${wildfly22.applicationServer.artifactId} + ${wildfly22.applicationServer.version} + ${managementPort.wildfly} + + ${wildfly22.arquillianContainer.groupId} + ${wildfly22.arquillianContainer.artifactId} + ${wildfly22.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.wildfly22.core} + + + org.wildfly.core + wildfly-cli + ${version.wildfly22.core} + + + org.wildfly.core + wildfly-patching + ${version.wildfly22.core} + + + +