Merge pull request #393 from jamezp/minor-updates

CI and POM updates
wildfly · Nov 21, 2023 · 124fe6b · 124fe6b
2 parents d77e852 + fa5eb77
commit 124fe6b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 28 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -7,8 +7,6 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
-    paths-ignore:
-      - ".github/workflows/manual-*.yml"
   pull_request:
     branches:
       - '**'
@@ -19,8 +17,23 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  format-check:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
 
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: 'temurin'
+          cache: 'maven'
+      - name: Validate Formatting
+        run: |
+          mvn -B validate -Pformat-check -Denforcer.skip=true
+  build:
+    needs: format-check
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -42,25 +55,9 @@ jobs:
         if: failure()
         with:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/surefire-reports/*.txt'
+          path: '**/surefire-reports/*'
       - uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: server-logs-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/server.log'
-
-  format-check:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: 11
-          distribution: 'temurin'
-          cache: 'maven'
-      - name: Validate Formatting
-        run: |
-          mvn -B validate -Pformat-check -Denforcer.skip=true
+          path: '**/server.log'
diff --git a/.github/workflows/wildfly-build.yml b/.github/workflows/wildfly-build.yml
@@ -21,8 +21,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest ]
-        java: ['11', '17', '20']
-        wildfly-version: ['28.0.1.Final', '29.0.0.Beta1']
+        java: ['11']
+        wildfly-version: ['28.0.1.Final', '29.0.1.Final']
 
     steps:
       - uses: actions/checkout@v4
@@ -38,7 +38,7 @@ jobs:
         if: failure()
         with:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/surefire-reports/*.txt'
+          path: '**/surefire-reports/*'
       - uses: actions/upload-artifact@v3
         if: failure()
         with:
@@ -58,7 +58,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        java: ['11', '17', '20']
+        java: ['11', '17', '21']
 
     steps:
       - uses: actions/checkout@v4
@@ -83,7 +83,7 @@ jobs:
         if: failure()
         with:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
-          path: '**/surefire-reports/*.txt'
+          path: '**/surefire-reports/*'
       - name: Upload server logs
         uses: actions/upload-artifact@v3
         if: failure()

diff --git a/pom.xml b/pom.xml
@@ -38,11 +38,12 @@
 
     <properties>
         <version.org.wildfly.core>20.0.2.Final</version.org.wildfly.core>
-        <version.org.wildfly.full>28.0.1.Final</version.org.wildfly.full>
+        <version.org.wildfly.full>30.0.0.Final</version.org.wildfly.full>
         <version.junit>4.13.2</version.junit>
         <version.org.junit>5.9.1</version.org.junit>
         <version.org.jboss.arquillian.core>1.8.0.Final</version.org.jboss.arquillian.core>
-        <version.org.jboss.arquillian.jakarta>1.8.0.Final</version.org.jboss.arquillian.jakarta>        <version.org.jboss.galleon>5.2.0.Final</version.org.jboss.galleon>
+        <version.org.jboss.arquillian.jakarta>1.8.0.Final</version.org.jboss.arquillian.jakarta>
+        <version.org.jboss.galleon>5.2.0.Final</version.org.jboss.galleon>
         <version.org.jboss.jandex>2.4.3.Final</version.org.jboss.jandex>
         <version.org.jboss.logging.jboss-logging>3.5.3.Final</version.org.jboss.logging.jboss-logging>
         <version.org.jboss.marshalling.jboss-marshalling>2.1.3.Final</version.org.jboss.marshalling.jboss-marshalling>