Skip to content

Commit

Permalink
add WildFly 33
Browse files Browse the repository at this point in the history
  • Loading branch information
simkam committed Sep 9, 2024
1 parent 4400ed0 commit fca2794
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 5 deletions.
23 changes: 23 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,29 @@ Dependencies for `creaper-commands`:
<version>24.0.1.Final</version>
</dependency>

#### WildFly 33 (33.0.1) (based on WildFly Core 25)

Dependencies for `creaper-core`:

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

Dependencies for `creaper-commands`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>25.0.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 @@ -108,6 +108,8 @@ public final class ServerVersion {
public static final ServerVersion VERSION_24_0_0 = new ServerVersion(24, 0, 0);
/** WF 32.0.x.Final */
public static final ServerVersion VERSION_25_0_0 = new ServerVersion(25, 0, 0);
/** WF 33.0.x.Final */
public static final ServerVersion VERSION_26_0_0 = new ServerVersion(26, 0, 0);

private static final ServerVersion[] KNOWN_VERSIONS = {
VERSION_0_0_0,
Expand Down Expand Up @@ -146,7 +148,8 @@ public final class ServerVersion {
VERSION_22_0_0,
VERSION_23_0_0,
VERSION_24_0_0,
VERSION_25_0_0
VERSION_25_0_0,
VERSION_26_0_0
};

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public void referenceEquality() {
assertSame(ServerVersion.VERSION_23_0_0, ServerVersion.from(23, 0, 0));
assertSame(ServerVersion.VERSION_24_0_0, ServerVersion.from(24, 0, 0));
assertSame(ServerVersion.VERSION_25_0_0, ServerVersion.from(25, 0, 0));
assertSame(ServerVersion.VERSION_26_0_0, ServerVersion.from(26, 0, 0));

assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
}
Expand Down Expand Up @@ -91,6 +92,7 @@ public void equality() {
assertSame(ServerVersion.VERSION_23_0_0, ServerVersion.from(23, 0, 0));
assertSame(ServerVersion.VERSION_24_0_0, ServerVersion.from(24, 0, 0));
assertSame(ServerVersion.VERSION_25_0_0, ServerVersion.from(25, 0, 0));
assertSame(ServerVersion.VERSION_26_0_0, ServerVersion.from(26, 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 @@ -71,6 +71,7 @@ public class OfflineServerVersionTest {
private static final String WFLY30_ROOT = "23.0";
private static final String WFLY31_ROOT = "24.0";
private static final String WFLY32_ROOT = "25.0";
private static final String WFLY33_ROOT = "26.0";

private static final String COMMUNITY = "community";
private static final String PREVIEW = "preview";
Expand Down Expand Up @@ -224,6 +225,11 @@ public void discoverStandaloneXml_wfly32() throws IOException {
test(ServerVersion.VERSION_25_0_0, STANDALONE_XML, WFLY32_ROOT, EAP7_LOGGING, EAP8_EE);
}

@Test
public void discoverStandaloneXml_wfly33() throws IOException {
test(ServerVersion.VERSION_26_0_0, STANDALONE_XML, WFLY33_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);
}
Expand Down Expand Up @@ -360,6 +366,11 @@ public void discoverHostXml_wfly32() throws IOException {
test(ServerVersion.VERSION_25_0_0, HOST_XML, WFLY32_ROOT, EAP7_LOGGING, EAP8_EE);
}

@Test
public void discoverHostXml_wfly33() throws IOException {
test(ServerVersion.VERSION_26_0_0, HOST_XML, WFLY33_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);
}
Expand Down Expand Up @@ -496,6 +507,11 @@ public void discoverDomainXml_wfly32() throws IOException {
test(ServerVersion.VERSION_25_0_0, DOMAIN_XML, WFLY32_ROOT, EAP7_LOGGING, EAP8_EE);
}

@Test
public void discoverDomainXml_wfly33() throws IOException {
test(ServerVersion.VERSION_26_0_0, DOMAIN_XML, WFLY33_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);
}
Expand Down
63 changes: 59 additions & 4 deletions testsuite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@
<version.wildfly32>32.0.1.Final</version.wildfly32>
<version.wildfly32.core>24.0.1.Final</version.wildfly32.core>
<version.wildfly32.arquillian>5.0.1.Final</version.wildfly32.arquillian>
<version.wildfly33>33.0.1.Final</version.wildfly33>
<version.wildfly33.core>25.0.1.Final</version.wildfly33.core>
<version.wildfly33.arquillian>5.1.0.Beta4</version.wildfly33.arquillian>


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

<wildfly33.applicationServer.groupId>org.wildfly</wildfly33.applicationServer.groupId>
<wildfly33.applicationServer.artifactId>wildfly-dist</wildfly33.applicationServer.artifactId>
<wildfly33.applicationServer.version>${version.wildfly33}</wildfly33.applicationServer.version>
<wildfly33.arquillianContainer.groupId>org.wildfly.arquillian</wildfly33.arquillianContainer.groupId>
<wildfly33.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly33.arquillianContainer.artifactId>
<wildfly33.arquillianContainer.version>${version.wildfly33.arquillian}</wildfly33.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 @@ -1444,10 +1454,6 @@

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

<properties>
<applicationServer.groupId>${wildfly32.applicationServer.groupId}</applicationServer.groupId>
Expand Down Expand Up @@ -1491,5 +1497,54 @@
</dependencies>
</profile>

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

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

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

</profiles>
</project>

0 comments on commit fca2794

Please sign in to comment.