diff --git a/README.md b/README.md index 334b85b9..04745e71 100644 --- a/README.md +++ b/README.md @@ -221,6 +221,52 @@ Dependencies for `creaper-commands`: 4.0.0.Final +#### WildFly 13 (based on WildFly Core 5) + +Dependencies for `creaper-core`: + + + org.wildfly.core + wildfly-controller-client + 5.0.0.Final + + + org.wildfly.core + wildfly-cli + 5.0.0.Final + + +Dependencies for `creaper-commands`: + + + org.wildfly.core + wildfly-patching + 5.0.0.Final + + +#### WildFly 14 (14.0.1) (based on WildFly Core 6) + +Dependencies for `creaper-core`: + + + org.wildfly.core + wildfly-controller-client + 6.0.2.Final + + + org.wildfly.core + wildfly-cli + 6.0.2.Final + + +Dependencies for `creaper-commands`: + + + org.wildfly.core + wildfly-patching + 6.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 d6030a49..22ee99fd 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 @@ -72,8 +72,10 @@ public final class ServerVersion { public static final ServerVersion VERSION_5_0_0 = new ServerVersion(5, 0, 0); /** WF 12.0.0.Final */ public static final ServerVersion VERSION_6_0_0 = new ServerVersion(6, 0, 0); - /** WF 13 (not yet final) */ + /** WF 13.0.0.Final */ public static final ServerVersion VERSION_7_0_0 = new ServerVersion(7, 0, 0); + /** WF 14.0.x.Final */ + public static final ServerVersion VERSION_8_0_0 = new ServerVersion(8, 0, 0); private static final ServerVersion[] KNOWN_VERSIONS = { VERSION_0_0_0, @@ -96,6 +98,7 @@ public final class ServerVersion { VERSION_5_0_0, VERSION_6_0_0, VERSION_7_0_0, + VERSION_8_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 255d3bb0..8bdcff2c 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 @@ -31,6 +31,7 @@ public void referenceEquality() { assertSame(ServerVersion.VERSION_5_0_0, ServerVersion.from(5, 0, 0)); assertSame(ServerVersion.VERSION_6_0_0, ServerVersion.from(6, 0, 0)); assertSame(ServerVersion.VERSION_7_0_0, ServerVersion.from(7, 0, 0)); + assertSame(ServerVersion.VERSION_8_0_0, ServerVersion.from(8, 0, 0)); assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42)); } @@ -57,6 +58,7 @@ public void equality() { assertEquals(ServerVersion.VERSION_5_0_0, ServerVersion.from(5, 0, 0)); assertEquals(ServerVersion.VERSION_6_0_0, ServerVersion.from(6, 0, 0)); assertEquals(ServerVersion.VERSION_7_0_0, ServerVersion.from(7, 0, 0)); + assertEquals(ServerVersion.VERSION_8_0_0, ServerVersion.from(8, 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 1a3fbf4d..51c9288d 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 @@ -50,6 +50,7 @@ public class OfflineServerVersionTest { private static final String WFLY12_ROOT = "6.0"; private static final String WFLY13_ROOT = "7.0"; + private static final String WFLY14_ROOT = "8.0"; @Rule public final TemporaryFolder tmp = new TemporaryFolder(); @@ -104,6 +105,11 @@ public void discoverStandaloneXml_wfly13() throws IOException { test(ServerVersion.VERSION_7_0_0, STANDALONE_XML, WFLY13_ROOT, EAP7_LOGGING, EAP7_EE); } + @Test + public void discoverStandaloneXml_wfly14() throws IOException { + test(ServerVersion.VERSION_8_0_0, STANDALONE_XML, WFLY14_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); @@ -129,6 +135,11 @@ public void discoverHostXml_wfly13() throws IOException { test(ServerVersion.VERSION_7_0_0, HOST_XML, WFLY13_ROOT, EAP7_LOGGING, EAP7_EE); } + @Test + public void discoverHostXml_wfly14() throws IOException { + test(ServerVersion.VERSION_8_0_0, HOST_XML, WFLY14_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); @@ -154,6 +165,11 @@ public void discoverDomainXml_wfly13() throws IOException { test(ServerVersion.VERSION_7_0_0, DOMAIN_XML, WFLY13_ROOT, EAP7_LOGGING, EAP7_EE); } + @Test + public void discoverDomainXml_wfly14() throws IOException { + test(ServerVersion.VERSION_8_0_0, DOMAIN_XML, WFLY14_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 845e7ad3..13f9a710 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -34,6 +34,13 @@ 12.0.0.Final 4.0.0.Final 2.1.0.Final + 13.0.0.Final + 5.0.0.Final + 2.1.0.Final + 14.0.1.Final + 6.0.2.Final + 2.1.1.Final + 9999 9990 @@ -87,7 +94,22 @@ wildfly-arquillian-container-managed ${version.wildfly12.arquillian} - + org.wildfly + wildfly-dist + ${version.wildfly13} + org.wildfly.arquillian + wildfly-arquillian-container-managed + ${version.wildfly13.arquillian} + + org.wildfly + wildfly-dist + ${version.wildfly14} + org.wildfly.arquillian + wildfly-arquillian-container-managed + ${version.wildfly14.arquillian} + + MUST-BE-DEFINED MUST-BE-DEFINED MUST-BE-DEFINED @@ -513,9 +535,6 @@ wildfly12 - - true - 1.8 @@ -561,5 +580,102 @@ + + wildfly13 + + + 1.8 + + ${wildfly13.applicationServer.groupId} + ${wildfly13.applicationServer.artifactId} + ${wildfly13.applicationServer.version} + ${managementPort.wildfly} + + ${wildfly13.arquillianContainer.groupId} + ${wildfly13.arquillianContainer.artifactId} + ${wildfly13.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.wildfly13.core} + + + org.wildfly.core + wildfly-cli + ${version.wildfly13.core} + + + org.wildfly.core + wildfly-patching + ${version.wildfly13.core} + + + + + + wildfly14 + + true + + + + 1.8 + + ${wildfly14.applicationServer.groupId} + ${wildfly14.applicationServer.artifactId} + ${wildfly14.applicationServer.version} + ${managementPort.wildfly} + + ${wildfly14.arquillianContainer.groupId} + ${wildfly14.arquillianContainer.artifactId} + ${wildfly14.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.wildfly14.core} + + + org.wildfly.core + wildfly-cli + ${version.wildfly14.core} + + + org.wildfly.core + wildfly-patching + ${version.wildfly14.core} + + + +