From e34589c7e0d375023e54a34380c6f344cd0425d8 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 27 Apr 2024 19:18:07 -0400 Subject: [PATCH 1/4] [pom] Require maven 3.6.3 per maven support Maven has officially flagged all versions 3.6.3 and before as end of life. All plugins are encouraged to require at least 3.6.3 going forwards. Many core plugins have already started requiring this. --- license-maven-plugin/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/license-maven-plugin/pom.xml b/license-maven-plugin/pom.xml index 827c2502a..ef33f7c6c 100644 --- a/license-maven-plugin/pom.xml +++ b/license-maven-plugin/pom.xml @@ -33,6 +33,10 @@ 2008 https://oss.carbou.me/license-maven-plugin + + 3.6.3 + + scm:git:https://github.com/mathieucarbou/license-maven-plugin.git scm:git:git@github.com:mycila/license-maven-plugin.git From 0691d356ed96789f53e058b88d2c7a96f009b2c4 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 27 Apr 2024 19:20:00 -0400 Subject: [PATCH 2/4] [GHA] Bump maven wrapper to 3.3.1 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8bdbe7bc0..ea57e855b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,6 +33,6 @@ jobs: java-version: 8 distribution: ${{ matrix.distribution }} - name: Load Maven 3.2.5 Integration Run (Consumer Run) using GitHub Provided Maven - run: mvn org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -V -B -D"maven=3.2.5" + run: mvn org.apache.maven.plugins:maven-wrapper-plugin:3.3.1:wrapper -V -B -D"maven=3.2.5" - name: Test with Maven 3.2.5 Java 8 (Consumer Run) run: ./mvnw invoker:run -V -B -D"maven.artifact.threads=64" -D"org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn" From eb02dc13b79fe12c30f32d9b037a1cfc5b3dbb7b Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 27 Apr 2024 19:20:39 -0400 Subject: [PATCH 3/4] [GHA] Bump maven consumer run to 3.6.3 now --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ea57e855b..9c5b6521f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -32,7 +32,7 @@ jobs: with: java-version: 8 distribution: ${{ matrix.distribution }} - - name: Load Maven 3.2.5 Integration Run (Consumer Run) using GitHub Provided Maven - run: mvn org.apache.maven.plugins:maven-wrapper-plugin:3.3.1:wrapper -V -B -D"maven=3.2.5" - - name: Test with Maven 3.2.5 Java 8 (Consumer Run) + - name: Load Maven 3.6.3 Integration Run (Consumer Run) using GitHub Provided Maven + run: mvn org.apache.maven.plugins:maven-wrapper-plugin:3.3.1:wrapper -V -B -D"maven=3.6.3" + - name: Test with Maven 3.6.3 Java 8 (Consumer Run) run: ./mvnw invoker:run -V -B -D"maven.artifact.threads=64" -D"org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn" From ae899b38268f2ceabd30ee62dd1a590f4cbb9ffd Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 27 Apr 2024 19:30:38 -0400 Subject: [PATCH 4/4] [GHA] Adjust macos for java 8 to use zulu --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9c5b6521f..1d4536744 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,7 +31,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: 8 - distribution: ${{ matrix.distribution }} + distribution: ${{ runner.os == 'macOS' && 'zulu' || 'temurin' }} - name: Load Maven 3.6.3 Integration Run (Consumer Run) using GitHub Provided Maven run: mvn org.apache.maven.plugins:maven-wrapper-plugin:3.3.1:wrapper -V -B -D"maven=3.6.3" - name: Test with Maven 3.6.3 Java 8 (Consumer Run)