Merge pull request #209 from jamezp/wildfly-upgrade

Upgrade WildFly to 29.0.1.Final
resteasy · Sep 5, 2023 · ea164ac · ea164ac
2 parents 8b62443 + b84b9ce
commit ea164ac
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 93 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -84,7 +84,7 @@ jobs:
         profile:
           - "'-Dsecurity.manager'"
           - "'-Dprovision.preview'"
-        wildfly-version: ['28.0.1.Final', '29.0.0.Final']
+        wildfly-version: ['28.0.1.Final', '29.0.1.Final']
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
diff --git a/.github/workflows/resteasy-build.yml b/.github/workflows/resteasy-build.yml
@@ -1,11 +1,25 @@
-# This workflow is for a nightly run against RESTEasy upstream
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: RESTEasy Test Build
+name: RESTEasy MicroProfile Integration Tests
 
 on:
   push:
     branches:
       - 'main'
+    paths-ignore:
+      - '.gitignore'
+      - ".mvn"
+      - "CODEOWNERS"
+      - "CODE_OF_CONDUCT.md"
+      - "CONTRIBUTING.adoc"
+      - "dco.txt"
+      - "LICENSE"
+      - "mvnw"
+      - "mvnw.cmd"
+      - "README.adoc"
+      - "security.txt"
+      - "*/README.adoc"
   schedule:
     - cron: '0 0 * * *' # Every day at 00:00 UTC
 
@@ -24,14 +38,16 @@ jobs:
   resteasy-microprofile-build:
     runs-on: ${{ matrix.os }}
     needs: resteasy-build
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
         java: ['11', '17', '21-ea']
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout RESTEasy MicroProfile
+        uses: actions/checkout@v4
       - uses: actions/download-artifact@v3
         with:
           name: resteasy-maven-repository
@@ -45,17 +61,23 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
           cache: 'maven'
-      - name: Build with Maven Java ${{ matrix.java }}
-        run: mvn  -B clean install '-Dversion.org.jboss.resteasy=${{ needs.resteasy-build.outputs.resteasy-version }}'
-      - name: Upload surefire reports
-        uses: actions/upload-artifact@v3
+      - name: Build and Test RESTEasy MicroProfile Java ${{ matrix.java }} - ${{ matrix.os }}
+        run: |
+          mvn clean install -B -Dversion.org.jboss.resteasy=${{ needs.resteasy-build.outputs.resteasy-version }} -Pci
+      - uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
           path: '**/surefire-reports/'
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: failsafe-reports-${{ matrix.os }}-${{ matrix.java }}
+          path: '**/failsafe-reports/'
       - name: Upload server logs
         uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: server-logs-${{ matrix.os }}-${{ matrix.java }}
           path: '**/*.log'
+
diff --git a/pom.xml b/pom.xml
@@ -70,7 +70,7 @@
         <version.org.jboss.logging.jboss-logging-tools>2.2.1.Final</version.org.jboss.logging.jboss-logging-tools>
         <version.org.jboss.resteasy>6.2.5.Final</version.org.jboss.resteasy>
 
-        <version.org.wildfly>29.0.0.Final</version.org.wildfly>
+        <version.org.wildfly>29.0.1.Final</version.org.wildfly>
         <!-- TODO (jrp) this can be removed when RESTEASY-2973 is resolved -->
         <version.org.wildfly.common>1.6.0.Final</version.org.wildfly.common>