From 89f2cd418041b50941f4cc3506595fe8ec948bb7 Mon Sep 17 00:00:00 2001 From: Martin Simka Date: Mon, 9 Sep 2024 10:43:43 +0200 Subject: [PATCH 1/3] add WildFly 30 --- CHANGELOG.md | 2 +- README.md | 23 +++++++ .../extras/creaper/core/ServerVersion.java | 5 +- .../creaper/core/ServerVersionTest.java | 2 + .../offline/OfflineServerVersionTest.java | 16 +++++ testsuite/pom.xml | 65 +++++++++++++++++-- 6 files changed, 107 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c03119ec..cc179b19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 2.0.3 (not yet released) -- added support for WildFly 28 - 29 +- added support for WildFly 28 - 30 ## 2.0.2 (2023-01-18) diff --git a/README.md b/README.md index 0a5d2871..b148d095 100644 --- a/README.md +++ b/README.md @@ -542,6 +542,29 @@ Dependencies for `creaper-commands`: 21.1.1.Final +#### WildFly 30 (30.0.1) (based on WildFly Core 22) + +Dependencies for `creaper-core`: + + + org.wildfly.core + wildfly-controller-client + 22.0.2.Final + + + org.wildfly.core + wildfly-cli + 22.0.2.Final + + +Dependencies for `creaper-commands`: + + + org.wildfly.core + wildfly-patching + 22.0.2.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 30272080..9db6d7d3 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 @@ -102,6 +102,8 @@ public final class ServerVersion { 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); + /** WF 30.0.x.Final */ + public static final ServerVersion VERSION_23_0_0 = new ServerVersion(23, 0, 0); private static final ServerVersion[] KNOWN_VERSIONS = { VERSION_0_0_0, @@ -137,7 +139,8 @@ public final class ServerVersion { VERSION_19_0_0, VERSION_20_0_0, VERSION_21_0_0, - VERSION_22_0_0 + VERSION_22_0_0, + VERSION_23_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 2a90a273..4823703f 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 @@ -45,6 +45,7 @@ public void referenceEquality() { 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)); + assertSame(ServerVersion.VERSION_23_0_0, ServerVersion.from(23, 0, 0)); assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42)); } @@ -85,6 +86,7 @@ public void equality() { 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)); + assertSame(ServerVersion.VERSION_23_0_0, ServerVersion.from(23, 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 6912188f..fb0508bc 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 @@ -68,6 +68,7 @@ public class OfflineServerVersionTest { private static final String WFLY27_ROOT = "20.0"; private static final String WFLY28_ROOT = "21.0"; private static final String WFLY29_ROOT = "22.0"; + private static final String WFLY30_ROOT = "23.0"; private static final String COMMUNITY = "community"; private static final String PREVIEW = "preview"; @@ -206,6 +207,11 @@ public void discoverStandaloneXml_wfly29() throws IOException { test(ServerVersion.VERSION_22_0_0, STANDALONE_XML, WFLY29_ROOT, EAP7_LOGGING, EAP8_EE); } + @Test + public void discoverStandaloneXml_wfly30() throws IOException { + test(ServerVersion.VERSION_23_0_0, STANDALONE_XML, WFLY30_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); } @@ -327,6 +333,11 @@ public void discoverHostXml_wfly29() throws IOException { test(ServerVersion.VERSION_22_0_0, HOST_XML, WFLY29_ROOT, EAP7_LOGGING, EAP8_EE); } + @Test + public void discoverHostXml_wfly30() throws IOException { + test(ServerVersion.VERSION_23_0_0, HOST_XML, WFLY30_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); } @@ -448,6 +459,11 @@ public void discoverDomainXml_wfly29() throws IOException { test(ServerVersion.VERSION_22_0_0, DOMAIN_XML, WFLY29_ROOT, EAP7_LOGGING, EAP8_EE); } + @Test + public void discoverDomainXml_wfly30() throws IOException { + test(ServerVersion.VERSION_23_0_0, DOMAIN_XML, WFLY30_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 274e5f0c..09ba1b31 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -80,6 +80,9 @@ 29.0.1.Final 21.1.1.Final 5.0.0.Final + 30.0.1.Final + 22.0.2.Final + 5.0.1.Final 9990 @@ -227,6 +230,13 @@ wildfly-arquillian-container-managed ${version.wildfly29.arquillian} + org.wildfly + wildfly-dist + ${version.wildfly30} + org.wildfly.arquillian + wildfly-arquillian-container-managed + ${version.wildfly30.arquillian} + MUST-BE-DEFINED @@ -1317,10 +1327,6 @@ wildfly29 - - - true - 1.8 @@ -1366,5 +1372,56 @@ + + wildfly30 + + + true + + + + 1.8 + + ${wildfly30.applicationServer.groupId} + ${wildfly30.applicationServer.artifactId} + ${wildfly30.applicationServer.version} + ${managementPort.wildfly} + + ${wildfly30.arquillianContainer.groupId} + ${wildfly30.arquillianContainer.artifactId} + ${wildfly30.arquillianContainer.version} + + ${ignoredCategory.wildfly11} + + + + + + org.wildfly.extras.creaper + creaper-core + + + org.wildfly.extras.creaper + creaper-commands + + + + org.wildfly.core + wildfly-controller-client + ${version.wildfly30.core} + + + org.wildfly.core + wildfly-cli + ${version.wildfly30.core} + + + org.wildfly.core + wildfly-patching + ${version.wildfly30.core} + + + + From 45cb242c70d1e4a6d09f075272d5a3c06499ceba Mon Sep 17 00:00:00 2001 From: Martin Simka Date: Mon, 9 Sep 2024 10:45:35 +0200 Subject: [PATCH 2/3] remove unused property from test suite pom --- testsuite/pom.xml | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/testsuite/pom.xml b/testsuite/pom.xml index 09ba1b31..cd92b56a 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -437,8 +437,6 @@ wildfly10 - 1.8 - ${wildfly10.applicationServer.groupId} ${wildfly10.applicationServer.artifactId} ${wildfly10.applicationServer.version} @@ -483,8 +481,6 @@ wildfly11 - 1.8 - ${wildfly11.applicationServer.groupId} ${wildfly11.applicationServer.artifactId} ${wildfly11.applicationServer.version} @@ -530,8 +526,6 @@ wildfly12 - 1.8 - ${wildfly12.applicationServer.groupId} ${wildfly12.applicationServer.artifactId} ${wildfly12.applicationServer.version} @@ -577,8 +571,6 @@ wildfly13 - 1.8 - ${wildfly13.applicationServer.groupId} ${wildfly13.applicationServer.artifactId} ${wildfly13.applicationServer.version} @@ -624,8 +616,6 @@ wildfly14 - 1.8 - ${wildfly14.applicationServer.groupId} ${wildfly14.applicationServer.artifactId} ${wildfly14.applicationServer.version} @@ -671,8 +661,6 @@ wildfly15 - 1.8 - ${wildfly15.applicationServer.groupId} ${wildfly15.applicationServer.artifactId} ${wildfly15.applicationServer.version} @@ -718,8 +706,6 @@ wildfly16 - 1.8 - ${wildfly16.applicationServer.groupId} ${wildfly16.applicationServer.artifactId} ${wildfly16.applicationServer.version} @@ -765,8 +751,6 @@ wildfly17 - 1.8 - ${wildfly17.applicationServer.groupId} ${wildfly17.applicationServer.artifactId} ${wildfly17.applicationServer.version} @@ -812,8 +796,6 @@ wildfly18 - 1.8 - ${wildfly18.applicationServer.groupId} ${wildfly18.applicationServer.artifactId} ${wildfly18.applicationServer.version} @@ -859,8 +841,6 @@ wildfly19 - 1.8 - ${wildfly19.applicationServer.groupId} ${wildfly19.applicationServer.artifactId} ${wildfly19.applicationServer.version} @@ -906,8 +886,6 @@ wildfly20 - 1.8 - ${wildfly20.applicationServer.groupId} ${wildfly20.applicationServer.artifactId} ${wildfly20.applicationServer.version} @@ -953,8 +931,6 @@ wildfly21 - 1.8 - ${wildfly21.applicationServer.groupId} ${wildfly21.applicationServer.artifactId} ${wildfly21.applicationServer.version} @@ -1000,8 +976,6 @@ wildfly22 - 1.8 - ${wildfly22.applicationServer.groupId} ${wildfly22.applicationServer.artifactId} ${wildfly22.applicationServer.version} @@ -1047,8 +1021,6 @@ wildfly23 - 1.8 - ${wildfly23.applicationServer.groupId} ${wildfly23.applicationServer.artifactId} ${wildfly23.applicationServer.version} @@ -1094,8 +1066,6 @@ wildfly24 - 1.8 - ${wildfly24.applicationServer.groupId} ${wildfly24.applicationServer.artifactId} ${wildfly24.applicationServer.version} @@ -1141,8 +1111,6 @@ wildfly25 - 1.8 - ${wildfly25.applicationServer.groupId} ${wildfly25.applicationServer.artifactId} ${wildfly25.applicationServer.version} @@ -1188,8 +1156,6 @@ wildfly26 - 1.8 - ${wildfly26.applicationServer.groupId} ${wildfly26.applicationServer.artifactId} ${wildfly26.applicationServer.version} @@ -1235,8 +1201,6 @@ wildfly27 - 1.8 - ${wildfly27.applicationServer.groupId} ${wildfly27.applicationServer.artifactId} ${wildfly27.applicationServer.version} @@ -1282,8 +1246,6 @@ wildfly28 - 1.8 - ${wildfly28.applicationServer.groupId} ${wildfly28.applicationServer.artifactId} ${wildfly28.applicationServer.version} @@ -1329,8 +1291,6 @@ wildfly29 - 1.8 - ${wildfly29.applicationServer.groupId} ${wildfly29.applicationServer.artifactId} ${wildfly29.applicationServer.version} @@ -1380,8 +1340,6 @@ - 1.8 - ${wildfly30.applicationServer.groupId} ${wildfly30.applicationServer.artifactId} ${wildfly30.applicationServer.version} From 4f19091f7b21ec924b67043e4954427a765c1dc5 Mon Sep 17 00:00:00 2001 From: Martin Simka Date: Mon, 9 Sep 2024 12:18:32 +0200 Subject: [PATCH 3/3] use existing socket binding in AddMessagingConnectorOnlineTest It worked before WildFly 30 because restart was required to actually apply changes (and it would fail after restart), but after [WFLY-18237](https://issues.redhat.com/browse/WFLY-18237) the validation happens immmediately. --- .../commands/messaging/AddMessagingConnectorOnlineTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/messaging/AddMessagingConnectorOnlineTest.java b/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/messaging/AddMessagingConnectorOnlineTest.java index a9aabb93..0c296673 100644 --- a/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/messaging/AddMessagingConnectorOnlineTest.java +++ b/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/messaging/AddMessagingConnectorOnlineTest.java @@ -63,7 +63,7 @@ public void addInVmConnector() throws CommandFailedException, IOException { @Test public void addGenericConnector() throws CommandFailedException, IOException { AddMessagingConnector addMessagingConnector = new AddMessagingConnector.GenericBuilder(TEST_CONNECTOR) - .socketBinding("testSocketBinding") + .socketBinding("http") .factoryClass("testClass") .build(); @@ -79,7 +79,7 @@ public void addGenericConnector() throws CommandFailedException, IOException { @Test public void addRemoteConnector() throws CommandFailedException, IOException { AddMessagingConnector addMessagingConnector = new AddMessagingConnector.RemoteBuilder(TEST_CONNECTOR) - .socketBinding("testSocketBinding") + .socketBinding("http") .build(); client.apply(addMessagingConnector);