Skip to content

Commit

Permalink
add WildFly 13.0.0.Final and WildFly 14.0.1.Final
Browse files Browse the repository at this point in the history
  • Loading branch information
@simkam
simkam committed Oct 26, 2018
1 parent 733b2e5 commit 21e317b
Show file tree
Hide file tree
Showing 5 changed files with 188 additions and 5 deletions.
46 changes: 46 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,52 @@ Dependencies for `creaper-commands`:
<version>4.0.0.Final</version>
</dependency>

#### WildFly 13 (based on WildFly Core 5)

Dependencies for `creaper-core`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller-client</artifactId>
<version>5.0.0.Final</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-cli</artifactId>
<version>5.0.0.Final</version>
</dependency>

Dependencies for `creaper-commands`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>5.0.0.Final</version>
</dependency>

#### WildFly 14 (14.0.1) (based on WildFly Core 6)

Dependencies for `creaper-core`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller-client</artifactId>
<version>6.0.2.Final</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-cli</artifactId>
<version>6.0.2.Final</version>
</dependency>

Dependencies for `creaper-commands`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>6.0.2.Final</version>
</dependency>

### Transitive Dependencies

These are the dependencies that you will get transitively when you depend
Expand Down
5 changes: 4 additions & 1 deletion core/src/main/java/org/wildfly/extras/creaper/core/ServerVersion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -96,6 +98,7 @@ public final class ServerVersion {
VERSION_5_0_0,
VERSION_6_0_0,
VERSION_7_0_0,
VERSION_8_0_0,
};

/**
Expand Down
2 changes: 2 additions & 0 deletions core/src/test/java/org/wildfly/extras/creaper/core/ServerVersionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand All @@ -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));
}
Expand Down
16 changes: 16 additions & 0 deletions core/src/test/java/org/wildfly/extras/creaper/core/offline/OfflineServerVersionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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
Expand Down
124 changes: 120 additions & 4 deletions testsuite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
<version.wildfly12>12.0.0.Final</version.wildfly12>
<version.wildfly12.core>4.0.0.Final</version.wildfly12.core>
<version.wildfly12.arquillian>2.1.0.Final</version.wildfly12.arquillian>
<version.wildfly13>13.0.0.Final</version.wildfly13>
<version.wildfly13.core>5.0.0.Final</version.wildfly13.core>
<version.wildfly13.arquillian>2.1.0.Final</version.wildfly13.arquillian>
<version.wildfly14>14.0.1.Final</version.wildfly14>
<version.wildfly14.core>6.0.2.Final</version.wildfly14.core>
<version.wildfly14.arquillian>2.1.1.Final</version.wildfly14.arquillian>


<managementPort.as7>9999</managementPort.as7>
<managementPort.wildfly>9990</managementPort.wildfly>
Expand Down Expand Up @@ -87,7 +94,22 @@
<wildfly12.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly12.arquillianContainer.artifactId>
<wildfly12.arquillianContainer.version>${version.wildfly12.arquillian}</wildfly12.arquillianContainer.version>

<!-- defined in profiles "as7", "wildfly8", "wildfly9", "wildfly10", "wildfly11" and "wildfly12" below -->
<wildfly13.applicationServer.groupId>org.wildfly</wildfly13.applicationServer.groupId>
<wildfly13.applicationServer.artifactId>wildfly-dist</wildfly13.applicationServer.artifactId>
<wildfly13.applicationServer.version>${version.wildfly13}</wildfly13.applicationServer.version>
<wildfly13.arquillianContainer.groupId>org.wildfly.arquillian</wildfly13.arquillianContainer.groupId>
<wildfly13.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly13.arquillianContainer.artifactId>
<wildfly13.arquillianContainer.version>${version.wildfly13.arquillian}</wildfly13.arquillianContainer.version>

<wildfly14.applicationServer.groupId>org.wildfly</wildfly14.applicationServer.groupId>
<wildfly14.applicationServer.artifactId>wildfly-dist</wildfly14.applicationServer.artifactId>
<wildfly14.applicationServer.version>${version.wildfly14}</wildfly14.applicationServer.version>
<wildfly14.arquillianContainer.groupId>org.wildfly.arquillian</wildfly14.arquillianContainer.groupId>
<wildfly14.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly14.arquillianContainer.artifactId>
<wildfly14.arquillianContainer.version>${version.wildfly14.arquillian}</wildfly14.arquillianContainer.version>

<!-- defined in profiles "as7", "wildfly8", "wildfly9", "wildfly10", "wildfly11", "wildfly12",
"wildfly13" and "wildfly14" below -->
<applicationServer.groupId>MUST-BE-DEFINED</applicationServer.groupId>
<applicationServer.artifactId>MUST-BE-DEFINED</applicationServer.artifactId>
<applicationServer.version>MUST-BE-DEFINED</applicationServer.version>
Expand Down Expand Up @@ -513,9 +535,6 @@

<profile>
<id>wildfly12</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>

<properties>
<version.java>1.8</version.java>
Expand Down Expand Up @@ -561,5 +580,102 @@
</dependencies>
</profile>

<profile>
<id>wildfly13</id>

<properties>
<version.java>1.8</version.java>

<applicationServer.groupId>${wildfly13.applicationServer.groupId}</applicationServer.groupId>
<applicationServer.artifactId>${wildfly13.applicationServer.artifactId}</applicationServer.artifactId>
<applicationServer.version>${wildfly13.applicationServer.version}</applicationServer.version>
<applicationServer.managementPort>${managementPort.wildfly}</applicationServer.managementPort>

<arquillianContainer.groupId>${wildfly13.arquillianContainer.groupId}</arquillianContainer.groupId>
<arquillianContainer.artifactId>${wildfly13.arquillianContainer.artifactId}</arquillianContainer.artifactId>
<arquillianContainer.version>${wildfly13.arquillianContainer.version}</arquillianContainer.version>

<tests.ignoredCategory>${ignoredCategory.wildfly11}</tests.ignoredCategory>
<tests.specialJvmArgs>${specialJvmArgs.wildfly}</tests.specialJvmArgs>
</properties>

<dependencies>
<dependency>
<groupId>org.wildfly.extras.creaper</groupId>
<artifactId>creaper-core</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.extras.creaper</groupId>
<artifactId>creaper-commands</artifactId>
</dependency>

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller-client</artifactId>
<version>${version.wildfly13.core}</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-cli</artifactId>
<version>${version.wildfly13.core}</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>${version.wildfly13.core}</version>
</dependency>
</dependencies>
</profile>

<profile>
<id>wildfly14</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>

<properties>
<version.java>1.8</version.java>

<applicationServer.groupId>${wildfly14.applicationServer.groupId}</applicationServer.groupId>
<applicationServer.artifactId>${wildfly14.applicationServer.artifactId}</applicationServer.artifactId>
<applicationServer.version>${wildfly14.applicationServer.version}</applicationServer.version>
<applicationServer.managementPort>${managementPort.wildfly}</applicationServer.managementPort>

<arquillianContainer.groupId>${wildfly14.arquillianContainer.groupId}</arquillianContainer.groupId>
<arquillianContainer.artifactId>${wildfly14.arquillianContainer.artifactId}</arquillianContainer.artifactId>
<arquillianContainer.version>${wildfly14.arquillianContainer.version}</arquillianContainer.version>

<tests.ignoredCategory>${ignoredCategory.wildfly11}</tests.ignoredCategory>
<tests.specialJvmArgs>${specialJvmArgs.wildfly}</tests.specialJvmArgs>
</properties>

<dependencies>
<dependency>
<groupId>org.wildfly.extras.creaper</groupId>
<artifactId>creaper-core</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.extras.creaper</groupId>
<artifactId>creaper-commands</artifactId>
</dependency>

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller-client</artifactId>
<version>${version.wildfly14.core}</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-cli</artifactId>
<version>${version.wildfly14.core}</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>${version.wildfly14.core}</version>
</dependency>
</dependencies>
</profile>

</profiles>
</project>

0 comments on commit 21e317b

Please sign in to comment.