diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a21268a..d6d0359 100644
--- 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
deleted file mode 100644
index 748fc2d..0000000
--- a/.github/workflows/nightly-ci.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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 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
-
-# Only run the latest job and cancel previous ones
-concurrency:
- group: 'nightly-${{ github.ref || github.run_id }}'
- cancel-in-progress: true
-
-jobs:
- resteasy-build:
- uses: resteasy/resteasy/.github/workflows/shared-resteasy-build.yml@6.2
- with:
- resteasy-branch: "6.2"
- resteasy-repo: "resteasy/resteasy"
-
- resteasy-nightly-test:
- name: Build and test against RESTEasy
- runs-on: ${{ matrix.os }}
- needs: resteasy-build
- timeout-minutes: 60
- strategy:
- fail-fast: false
- matrix:
- os: [ ubuntu-latest ]
- java: [ '11', '17' , '21-ea']
-
- steps:
- - name: Checkout RESTEasy MicroProfile
- uses: actions/checkout@v4
- - uses: actions/download-artifact@v3
- with:
- name: resteasy-maven-repository
- path: .
- - name: Extract Maven Repo
- shell: bash
- run: tar -xzf resteasy-maven-repository.tar.gz -C ~
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v3
- with:
- java-version: ${{ matrix.java }}
- distribution: 'temurin'
- cache: 'maven'
- - 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/.github/workflows/resteasy-build.yml b/.github/workflows/resteasy-build.yml
index e55378a..700c506 100644
--- 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,6 +38,7 @@ jobs:
resteasy-microprofile-build:
runs-on: ${{ matrix.os }}
needs: resteasy-build
+ timeout-minutes: 60
strategy:
fail-fast: false
matrix:
@@ -31,7 +46,8 @@ jobs:
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
index ac7eb1b..cbf8f9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
2.2.1.Final
6.2.5.Final
- 29.0.0.Final
+ 29.0.1.Final
1.6.0.Final