Skip to content

add WildFly 34 #246

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

Merged
jbliznak merged 1 commit into from
Jan 6, 2025
Merged

add WildFly 34 #246

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 2.1.0 (not yet released)

- dropped explicit dependency on `jboss-logging`
- added support for WildFly 34

## 2.0.3 (2024-09-16)

Expand Down
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 @@ -638,6 +638,29 @@ Dependencies for `creaper-commands`:
<version>25.0.1.Final</version>
</dependency>

#### WildFly 34 (34.0.1) (based on WildFly Core 26)

Dependencies for `creaper-core`:

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

Dependencies for `creaper-commands`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>26.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 @@ -110,6 +110,8 @@ public final class ServerVersion {
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);
/** WF 34.0.x.Final */
public static final ServerVersion VERSION_27_0_0 = new ServerVersion(27, 0, 0);

private static final ServerVersion[] KNOWN_VERSIONS = {
VERSION_0_0_0,
Expand Down Expand Up @@ -149,7 +151,8 @@ public final class ServerVersion {
VERSION_23_0_0,
VERSION_24_0_0,
VERSION_25_0_0,
VERSION_26_0_0
VERSION_26_0_0,
VERSION_27_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 @@ -49,6 +49,7 @@ public void referenceEquality() {
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));
assertSame(ServerVersion.VERSION_27_0_0, ServerVersion.from(27, 0, 0));

assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
}
Expand Down Expand Up @@ -93,6 +94,7 @@ public void equality() {
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));
assertSame(ServerVersion.VERSION_27_0_0, ServerVersion.from(27, 0, 0));

assertEquals(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
}
Expand Down
63 changes: 59 additions & 4 deletions testsuite/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@
<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>
<version.wildfly34>34.0.1.Final</version.wildfly34>
<version.wildfly34.core>26.0.1.Final</version.wildfly34.core>
<version.wildfly34.arquillian>5.1.0.Beta6</version.wildfly34.arquillian>


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

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

<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>
Expand Down Expand Up @@ -1546,5 +1552,54 @@
</dependencies>
</profile>

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

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

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

</profiles>
</project>
Loading