Merge pull request #264 from jamezp/wf-upgrade

Upgrade WildFly to 26.1.2.Final as a default for testing. Added CI te…
wildfly · Nov 8, 2022 · e67f1e6 · e67f1e6
2 parents b4f734e + a11370a
commit e67f1e6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,13 +13,14 @@ on:
 
 jobs:
   build:
-    name: ${{ matrix.os }}-jdk${{ matrix.java }}
+    name: ${{ matrix.os }}-jdk${{ matrix.java }}-${{ matrix.wildfly-version }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest ]
         java: ['11', '17']
+        wildfly-version: ['25.0.0.Final', '26.1.2.Final', '27.0.0.Beta1']
 
     steps:
       - uses: actions/checkout@v3
@@ -29,23 +30,23 @@ jobs:
           java-version: ${{ matrix.java }}
           cache: 'maven'
           distribution: 'temurin'
-      - name: Build and Test on ${{ matrix.java }}
-        run: mvn clean install '-Dorg.jboss.logmanager.nocolor=true'
+      - name: Build and Test on ${{ matrix.java }} - ${{ matrix.wildfly-version }}
+        run: mvn clean install '-Dorg.jboss.logmanager.nocolor=true' '-Dversion.org.wildfly=${{ matrix.wildfly-version }}'
       - name: Upload surefire logs for failed run
         uses: actions/upload-artifact@v3
         if: failure()
         with:
-          name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
+          name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
           path: '**/surefire-reports/*.txt'
       - name: Upload failsafe logs for failed run
         uses: actions/upload-artifact@v3
         if: failure()
         with:
-          name: failsafe-reports-${{ matrix.os }}-${{ matrix.java }}
+          name: failsafe-reports-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
           path: '**/failsafe-reports/*.txt'
       - name: Upload logs for failed run
         uses: actions/upload-artifact@v3
         if: failure()
         with:
-          name: server-logs-${{ matrix.os }}-${{ matrix.java }}
+          name: server-logs-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
           path: '**/*.log'
diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
     <repositories>
         <repository>
             <id>nexus</id>
-            <url>https://repository.jboss.org/nexus/content/groups/public-jboss</url>
+            <url>https://repository.jboss.org/nexus/content/groups/public</url>
         </repository>
         <repository>
             <id>redhat-ga</id>
@@ -95,7 +95,7 @@
         <version.org.wildfly.common.wildfly-common>1.6.0.Final</version.org.wildfly.common.wildfly-common>
         <!-- This version property is also retrieved by plugin at runtime to resolve CLI artifact -->
         <version.org.wildfly.core>19.0.0.Final</version.org.wildfly.core>
-        <version.org.wildfly>25.0.0.Final</version.org.wildfly>
+        <version.org.wildfly>26.1.2.Final</version.org.wildfly>
         <version.org.wildfly.channel>1.0.0.Beta3</version.org.wildfly.channel>
 
         <!-- maven dependencies -->

diff --git a/tests/domain-tests/src/test/java/org/wildfly/plugin/deployment/DeployTest.java b/tests/domain-tests/src/test/java/org/wildfly/plugin/deployment/DeployTest.java
@@ -41,6 +41,7 @@
 import org.junit.Test;
 import org.wildfly.plugin.common.ServerOperations;
 import org.wildfly.plugin.core.DeploymentManager;
+import org.wildfly.plugin.core.ServerHelper;
 import org.wildfly.plugin.core.UndeployDescription;
 import org.wildfly.plugin.tests.AbstractWildFlyServerMojoTest;
 
@@ -94,7 +95,7 @@ public void testDeployWithStoppedServer() throws Exception {
         if (deploymentManager.hasDeployment(DEPLOYMENT_NAME, DEFAULT_SERVER_GROUP)) {
             deploymentManager.undeploy(UndeployDescription.of(DEPLOYMENT_NAME).addServerGroups(DEFAULT_SERVER_GROUPS));
         }
-        final ModelNode address = ServerOperations.createAddress("host", "master", "server-config", "server-one");
+        final ModelNode address = ServerHelper.determineHostAddress(client).add("server-config").add("server-one");
         try {
             // Shutdown server-one
             final ModelNode op = ServerOperations.createOperation("stop", address);