Skip to content

Commit

Permalink
add WildFly 29
Browse files Browse the repository at this point in the history
  • Loading branch information
simkam committed Oct 3, 2023
1 parent 6cb92d4 commit 3b1ce05
Show file tree
Hide file tree
Showing 6 changed files with 107 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
23 changes: 23 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,29 @@ Dependencies for `creaper-commands`:
<version>20.0.2.Final</version>
</dependency>

#### WildFly 29 (29.0.1) (based on WildFly Core 21)

Dependencies for `creaper-core`:

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

Dependencies for `creaper-commands`:

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

### Transitive Dependencies

These are the dependencies that you will get transitively when you depend
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
};

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down Expand Up @@ -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));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down
65 changes: 61 additions & 4 deletions testsuite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@
<version.wildfly28>28.0.1.Final</version.wildfly28>
<version.wildfly28.core>20.0.2.Final</version.wildfly28.core>
<version.wildfly28.arquillian>5.0.0.Alpha6</version.wildfly28.arquillian>
<version.wildfly29>29.0.1.Final</version.wildfly29>
<version.wildfly29.core>21.1.1.Final</version.wildfly29.core>
<version.wildfly29.arquillian>5.0.0.Final</version.wildfly29.arquillian>


<managementPort.wildfly>9990</managementPort.wildfly>
Expand Down Expand Up @@ -217,6 +220,13 @@
<wildfly28.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly28.arquillianContainer.artifactId>
<wildfly28.arquillianContainer.version>${version.wildfly28.arquillian}</wildfly28.arquillianContainer.version>

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

<!-- defined in profiles "wildfly10", "wildfly11", "wildfly12", "wildfly13", "wildfly14", "wildfly15",
"wildfly16", "wildfly17", "wildfly18", "wildfly19" and "wildfly20" below -->
<applicationServer.groupId>MUST-BE-DEFINED</applicationServer.groupId>
Expand Down Expand Up @@ -1260,10 +1270,6 @@

<profile>
<id>wildfly28</id>
<activation>
<!-- Note: WildFly 27+ doesn't support JDK 1.8 anymore -->
<activeByDefault>true</activeByDefault>
</activation>

<properties>
<version.java>1.8</version.java>
Expand Down Expand Up @@ -1309,5 +1315,56 @@
</dependencies>
</profile>

<profile>
<id>wildfly29</id>
<activation>
<!-- Note: WildFly 27+ doesn't support JDK 1.8 anymore -->
<activeByDefault>true</activeByDefault>
</activation>

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

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

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

<tests.ignoredCategory>${ignoredCategory.wildfly11}</tests.ignoredCategory>
<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.wildfly29.core}</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-cli</artifactId>
<version>${version.wildfly29.core}</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>${version.wildfly29.core}</version>
</dependency>
</dependencies>
</profile>

</profiles>
</project>

0 comments on commit 3b1ce05

Please sign in to comment.