Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add WildFly 22 #207

Merged
merged 1 commit into from
Jun 17, 2022
Merged

add WildFly 22 #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,29 @@ Dependencies for `creaper-commands`:
<version>13.0.3.Final</version>
</dependency>

#### WildFly 22 (22.0.1) (based on WildFly Core 14)

Dependencies for `creaper-core`:

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

Dependencies for `creaper-commands`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>14.0.1.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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ public final class ServerVersion {
public static final ServerVersion VERSION_13_0_0 = new ServerVersion(13, 0, 0);
/** WF 21.0.x.Final */
public static final ServerVersion VERSION_14_0_0 = new ServerVersion(14, 0, 0);
/** WF 22.0.x.Final */
public static final ServerVersion VERSION_15_0_0 = new ServerVersion(15, 0, 0);

private static final ServerVersion[] KNOWN_VERSIONS = {
VERSION_0_0_0,
Expand Down Expand Up @@ -113,7 +115,8 @@ public final class ServerVersion {
VERSION_10_0_0,
VERSION_12_0_0,
VERSION_13_0_0,
VERSION_14_0_0
VERSION_14_0_0,
VERSION_15_0_0
};

/**
Expand Down
2 changes: 2 additions & 0 deletions core/src/test/java/org/wildfly/extras/creaper/core/ServerVersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public void referenceEquality() {
assertSame(ServerVersion.VERSION_12_0_0, ServerVersion.from(12, 0, 0));
assertSame(ServerVersion.VERSION_13_0_0, ServerVersion.from(13, 0, 0));
assertSame(ServerVersion.VERSION_14_0_0, ServerVersion.from(14, 0, 0));
assertSame(ServerVersion.VERSION_15_0_0, ServerVersion.from(15, 0, 0));

assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
}
Expand Down Expand Up @@ -69,6 +70,7 @@ public void equality() {
assertEquals(ServerVersion.VERSION_12_0_0, ServerVersion.from(12, 0, 0));
assertEquals(ServerVersion.VERSION_13_0_0, ServerVersion.from(13, 0, 0));
assertSame(ServerVersion.VERSION_14_0_0, ServerVersion.from(14, 0, 0));
assertSame(ServerVersion.VERSION_15_0_0, ServerVersion.from(15, 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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public class OfflineServerVersionTest {
private static final String WFLY19_ROOT = "12.0";
private static final String WFLY20_ROOT = "13.0";
private static final String WFLY21_ROOT = "14.0";
private static final String WFLY22_ROOT = "15.0";

@Rule
public final TemporaryFolder tmp = new TemporaryFolder();
Expand Down Expand Up @@ -152,6 +153,11 @@ public void discoverStandaloneXml_wfly21() throws IOException {
test(ServerVersion.VERSION_14_0_0, STANDALONE_XML, WFLY21_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverStandaloneXml_wfly22() throws IOException {
test(ServerVersion.VERSION_15_0_0, STANDALONE_XML, WFLY22_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 Down Expand Up @@ -217,6 +223,11 @@ public void discoverHostXml_wfly21() throws IOException {
test(ServerVersion.VERSION_14_0_0, HOST_XML, WFLY21_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverHostXml_wfly22() throws IOException {
test(ServerVersion.VERSION_15_0_0, HOST_XML, WFLY22_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 Down Expand Up @@ -282,6 +293,11 @@ public void discoverDomainXml_wfly21() throws IOException {
test(ServerVersion.VERSION_14_0_0, DOMAIN_XML, WFLY21_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverDomainXml_wfly22() throws IOException {
test(ServerVersion.VERSION_15_0_0, DOMAIN_XML, WFLY22_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
63 changes: 60 additions & 3 deletions testsuite/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
<version.wildfly21>21.0.2.Final</version.wildfly21>
<version.wildfly21.core>13.0.3.Final</version.wildfly21.core>
<version.wildfly21.arquillian>2.2.0.Final</version.wildfly21.arquillian>
<version.wildfly22>22.0.1.Final</version.wildfly22>
<version.wildfly22.core>14.0.1.Final</version.wildfly22.core>
<version.wildfly22.arquillian>3.0.1.Final</version.wildfly22.arquillian>


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

<wildfly22.applicationServer.groupId>org.wildfly</wildfly22.applicationServer.groupId>
<wildfly22.applicationServer.artifactId>wildfly-dist</wildfly22.applicationServer.artifactId>
<wildfly22.applicationServer.version>${version.wildfly22}</wildfly22.applicationServer.version>
<wildfly22.arquillianContainer.groupId>org.wildfly.arquillian</wildfly22.arquillianContainer.groupId>
<wildfly22.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly22.arquillianContainer.artifactId>
<wildfly22.arquillianContainer.version>${version.wildfly22.arquillian}</wildfly22.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 @@ -863,9 +873,6 @@

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

<properties>
<version.java>1.8</version.java>
Expand Down Expand Up @@ -911,5 +918,55 @@
</dependencies>
</profile>

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

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

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

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

</profiles>
</project>