From 1c13ad3cc33e822bc4b0cb236f9bcd73728c6e7e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 9 Jun 2024 11:25:01 -0400 Subject: [PATCH 1/2] [GHA] Move maven 4 to beta 3 --- .github/workflows/it-maven-4.0.0.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/it-maven-4.0.0.yaml b/.github/workflows/it-maven-4.0.0.yaml index c7379cec..0c76b1cf 100644 --- a/.github/workflows/it-maven-4.0.0.yaml +++ b/.github/workflows/it-maven-4.0.0.yaml @@ -1,11 +1,11 @@ -name: Java Integration Tests Maven 4.0.0-alpha-13 +name: Java Integration Tests Maven 4.0.0-beta-3 on: [push, pull_request] jobs: test: runs-on: ubuntu-latest - name: Integration Tests Maven 4.0.0-alpha-13 + name: Integration Tests Maven 4.0.0-beta-3 steps: - uses: actions/checkout@v4 @@ -14,9 +14,9 @@ jobs: with: java-version: 21 distribution: zulu - - name: Load Maven 4.0.0-alpha-13 - run: mvn -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-alpha-13 --no-transfer-progress + - name: Load Maven 4.0.0-beta-3 + run: mvn -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-beta-3 --no-transfer-progress - name: Build Setup - run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-13 --no-transfer-progress + run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-beta-3 --no-transfer-progress - name: Integration Test with Maven - run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=8 -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-13 --no-transfer-progress + run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=8 -Dlicense.skip=true -Dmaven.min-version=4.0.0-beta-3 --no-transfer-progress From deadfa711d59d87aa6eef181a51853f8ad0d4f4f Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 9 Jun 2024 11:25:38 -0400 Subject: [PATCH 2/2] [GHA} Move maven wrapper to 3.3.2 --- .github/workflows/it-maven-3.6.3.yaml | 2 +- .github/workflows/it-maven-4.0.0.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/it-maven-3.6.3.yaml b/.github/workflows/it-maven-3.6.3.yaml index 96e26718..8f5f1b45 100644 --- a/.github/workflows/it-maven-3.6.3.yaml +++ b/.github/workflows/it-maven-3.6.3.yaml @@ -15,7 +15,7 @@ jobs: java-version: 21 distribution: zulu - name: Load Maven 3.6.3 - run: mvn -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=3.6.3 --no-transfer-progress + run: mvn -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper -Dmaven=3.6.3 --no-transfer-progress - name: Build Setup run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=3.6.3 - name: Integration Test with Maven diff --git a/.github/workflows/it-maven-4.0.0.yaml b/.github/workflows/it-maven-4.0.0.yaml index 0c76b1cf..1bb435f3 100644 --- a/.github/workflows/it-maven-4.0.0.yaml +++ b/.github/workflows/it-maven-4.0.0.yaml @@ -15,7 +15,7 @@ jobs: java-version: 21 distribution: zulu - name: Load Maven 4.0.0-beta-3 - run: mvn -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-beta-3 --no-transfer-progress + run: mvn -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper -Dmaven=4.0.0-beta-3 --no-transfer-progress - name: Build Setup run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-beta-3 --no-transfer-progress - name: Integration Test with Maven