diff --git a/.github/workflows/pull-request-check.yml b/.github/workflows/pull-request-check.yml index 4eee56e2..49ff1223 100644 --- a/.github/workflows/pull-request-check.yml +++ b/.github/workflows/pull-request-check.yml @@ -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: @@ -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: @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 57786c85..de0115b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/README.md b/README.md index 41249e3c..00475669 100644 --- a/README.md +++ b/README.md @@ -661,6 +661,29 @@ Dependencies for `creaper-commands`: 26.0.1.Final +#### WildFly 35 (35.0.1) (based on WildFly Core 27) + +Dependencies for `creaper-core`: + + + org.wildfly.core + wildfly-controller-client + 27.0.1.Final + + + org.wildfly.core + wildfly-cli + 27.0.1.Final + + +Dependencies for `creaper-commands`: + + + org.wildfly.core + wildfly-patching + 27.0.1.Final + + ### Transitive Dependencies These are the dependencies that you will get transitively when you depend diff --git a/commands/pom.xml b/commands/pom.xml index 3534c677..4d85c557 100644 --- a/commands/pom.xml +++ b/commands/pom.xml @@ -5,7 +5,7 @@ org.wildfly.extras.creaper creaper-parent - 2.0.4-SNAPSHOT + 2.1.0-SNAPSHOT creaper-commands diff --git a/core/pom.xml b/core/pom.xml index 752ab933..b95f90ea 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ org.wildfly.extras.creaper creaper-parent - 2.0.4-SNAPSHOT + 2.1.0-SNAPSHOT creaper-core diff --git a/core/src/main/java/org/wildfly/extras/creaper/core/ServerVersion.java b/core/src/main/java/org/wildfly/extras/creaper/core/ServerVersion.java index 49c5dfde..4f93ffe6 100644 --- a/core/src/main/java/org/wildfly/extras/creaper/core/ServerVersion.java +++ b/core/src/main/java/org/wildfly/extras/creaper/core/ServerVersion.java @@ -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, @@ -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 }; /** diff --git a/core/src/test/java/org/wildfly/extras/creaper/core/ServerVersionTest.java b/core/src/test/java/org/wildfly/extras/creaper/core/ServerVersionTest.java index fad5980b..0fc0cdbd 100644 --- a/core/src/test/java/org/wildfly/extras/creaper/core/ServerVersionTest.java +++ b/core/src/test/java/org/wildfly/extras/creaper/core/ServerVersionTest.java @@ -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)); } @@ -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)); } diff --git a/pom.xml b/pom.xml index e9152fb1..22382193 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.wildfly.extras.creaper creaper-parent - 2.0.4-SNAPSHOT + 2.1.0-SNAPSHOT pom Creaper: Parent diff --git a/testsuite/common/pom.xml b/testsuite/common/pom.xml index 6f9fee93..d4aecf75 100644 --- a/testsuite/common/pom.xml +++ b/testsuite/common/pom.xml @@ -5,7 +5,7 @@ org.wildfly.extras.creaper creaper-testsuite - 2.0.4-SNAPSHOT + 2.1.0-SNAPSHOT creaper-testsuite-common diff --git a/testsuite/pom.xml b/testsuite/pom.xml index a4814ee9..9b93a8b7 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -5,7 +5,7 @@ org.wildfly.extras.creaper creaper-parent - 2.0.4-SNAPSHOT + 2.1.0-SNAPSHOT creaper-testsuite @@ -95,6 +95,9 @@ 34.0.1.Final 26.0.1.Final 5.1.0.Beta6 + 35.0.1.Final + 27.0.1.Final + 5.1.0.Beta9 9990 @@ -277,6 +280,13 @@ wildfly-arquillian-container-managed ${version.wildfly34.arquillian} + org.wildfly + wildfly-dist + ${version.wildfly35} + org.wildfly.arquillian + wildfly-arquillian-container-managed + ${version.wildfly35.arquillian} + MUST-BE-DEFINED @@ -1554,10 +1564,6 @@ wildfly34 - - - true - ${wildfly34.applicationServer.groupId} @@ -1601,5 +1607,56 @@ + + wildfly35 + + + true + + + + ${wildfly35.applicationServer.groupId} + ${wildfly35.applicationServer.artifactId} + ${wildfly35.applicationServer.version} + ${managementPort.wildfly} + + ${wildfly35.arquillianContainer.groupId} + ${wildfly35.arquillianContainer.artifactId} + ${wildfly35.arquillianContainer.version} + + ${ignoredCategory.wildfly11} + + + + + + org.wildfly.extras.creaper + creaper-core + + + org.wildfly.extras.creaper + creaper-commands + + + + org.wildfly.core + wildfly-controller-client + ${version.wildfly35.core} + + + org.wildfly.core + wildfly-cli + ${version.wildfly35.core} + + + org.wildfly.core + wildfly-patching + ${version.wildfly35.core} + + + + diff --git a/testsuite/standalone/pom.xml b/testsuite/standalone/pom.xml index 60dde4f7..e941aa7b 100644 --- a/testsuite/standalone/pom.xml +++ b/testsuite/standalone/pom.xml @@ -5,7 +5,7 @@ org.wildfly.extras.creaper creaper-testsuite - 2.0.4-SNAPSHOT + 2.1.0-SNAPSHOT creaper-testsuite-standalone