Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 38 additions & 2 deletions .github/workflows/pull-request-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
java: [ 11, 17, 21 ]
java: [ 17, 21 ]
fail-fast: false
name: Non-elytron tests on JDK ${{ matrix.java }} - default WildFly profile
steps:
Expand All @@ -30,7 +30,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
java: [ 11, 17, 21 ]
java: [ 17, 21 ]
fail-fast: false
name: Elytron tests on JDK ${{ matrix.java }} - default WildFly profile
steps:
Expand Down Expand Up @@ -79,3 +79,39 @@ jobs:
architecture: x64
- name: Tests - elytron
run: mvn verify -s settings.xml -B -fae -Dmaven.test.redirectTestOutputToFile=true -Dtest=**.elytron.** -Pwildfly10
Tests-non-elytron-wildfly-34:
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
matrix:
java: [ 11 ]
fail-fast: false
name: Non-elytron tests on JDK ${{ matrix.java }} - WildFly 34 profile
steps:
- uses: actions/checkout@v1
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
java-package: jdk
architecture: x64
- name: Tests - non-elytron
run: mvn verify -s settings.xml -B -fae -Dmaven.test.redirectTestOutputToFile=true -Dtest=\!**.elytron.** -Pwildfly34
Tests-elytron-wildfly-34:
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
matrix:
java: [ 11 ]
fail-fast: false
name: Elytron tests on JDK ${{ matrix.java }} - WildFly 34 profile
steps:
- uses: actions/checkout@v1
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
java-package: jdk
architecture: x64
- name: Tests - elytron
run: mvn verify -s settings.xml -B -fae -Dmaven.test.redirectTestOutputToFile=true -Dtest=**.elytron.** -Pwildfly34
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## 2.1.0 (not yet released)

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

## 2.0.3 (2024-09-16)

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

#### WildFly 35 (35.0.1) (based on WildFly Core 27)

Dependencies for `creaper-core`:

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

Dependencies for `creaper-commands`:

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

### Transitive Dependencies

These are the dependencies that you will get transitively when you depend
Expand Down
2 changes: 1 addition & 1 deletion commands/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.wildfly.extras.creaper</groupId>
<artifactId>creaper-parent</artifactId>
<version>2.0.4-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>

<artifactId>creaper-commands</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.wildfly.extras.creaper</groupId>
<artifactId>creaper-parent</artifactId>
<version>2.0.4-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>

<artifactId>creaper-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ public final class ServerVersion {
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);
/** WF 35.0.x.Final */
public static final ServerVersion VERSION_28_0_0 = new ServerVersion(28, 0, 0);

private static final ServerVersion[] KNOWN_VERSIONS = {
VERSION_0_0_0,
Expand Down Expand Up @@ -152,7 +154,8 @@ public final class ServerVersion {
VERSION_24_0_0,
VERSION_25_0_0,
VERSION_26_0_0,
VERSION_27_0_0
VERSION_27_0_0,
VERSION_28_0_0
};

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public void referenceEquality() {
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));
assertSame(ServerVersion.VERSION_28_0_0, ServerVersion.from(28, 0, 0));

assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
}
Expand Down Expand Up @@ -95,6 +96,7 @@ public void equality() {
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));
assertSame(ServerVersion.VERSION_28_0_0, ServerVersion.from(28, 0, 0));

assertEquals(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.wildfly.extras.creaper</groupId>
<artifactId>creaper-parent</artifactId>
<version>2.0.4-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Creaper: Parent</name>
Expand Down
2 changes: 1 addition & 1 deletion testsuite/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.wildfly.extras.creaper</groupId>
<artifactId>creaper-testsuite</artifactId>
<version>2.0.4-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>

<artifactId>creaper-testsuite-common</artifactId>
Expand Down
67 changes: 62 additions & 5 deletions testsuite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.wildfly.extras.creaper</groupId>
<artifactId>creaper-parent</artifactId>
<version>2.0.4-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>

<artifactId>creaper-testsuite</artifactId>
Expand Down Expand Up @@ -95,6 +95,9 @@
<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>
<version.wildfly35>35.0.1.Final</version.wildfly35>
<version.wildfly35.core>27.0.1.Final</version.wildfly35.core>
<version.wildfly35.arquillian>5.1.0.Beta9</version.wildfly35.arquillian>


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

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

<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>
Expand Down Expand Up @@ -1601,5 +1607,56 @@
</dependencies>
</profile>

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

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

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

</profiles>
</project>
2 changes: 1 addition & 1 deletion testsuite/standalone/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.wildfly.extras.creaper</groupId>
<artifactId>creaper-testsuite</artifactId>
<version>2.0.4-SNAPSHOT</version>
<version>2.1.0-SNAPSHOT</version>
</parent>

<artifactId>creaper-testsuite-standalone</artifactId>
Expand Down