From a1f222d06eba640ec47bcf85caf3adf2e2df248e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 19 Aug 2023 20:06:19 -0400 Subject: [PATCH 1/5] [GHA] Update maven 4 to alpha 7 --- .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 c98910e6..ee474f21 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-4 +name: Java Integration Tests Maven 4.0.0-alpha-7 on: [push, pull_request] jobs: test: runs-on: ubuntu-latest - name: Integration Tests Maven 4.0.0-alpha-4 + name: Integration Tests Maven 4.0.0-alpha-7 steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 @@ -14,9 +14,9 @@ jobs: with: java-version: 17 distribution: zulu - - name: Load Maven 4.0.0-alpha-4 - run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-alpha-4 --no-transfer-progress + - name: Load Maven 4.0.0-alpha-7 + run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-alpha-7 --no-transfer-progress - name: Build Setup - run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-4 --no-transfer-progress + run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-7 --no-transfer-progress - name: Integration Test with Maven - run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-4 --no-transfer-progress + run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-7 --no-transfer-progress From ac1e6377fe57d8eff8c0617c4659f17be2a3d309 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 19 Aug 2023 20:10:21 -0400 Subject: [PATCH 2/5] [GHA] Try maven 4 alpha 5 --- .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 ee474f21..245aa7cc 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-7 +name: Java Integration Tests Maven 4.0.0-alpha-5 on: [push, pull_request] jobs: test: runs-on: ubuntu-latest - name: Integration Tests Maven 4.0.0-alpha-7 + name: Integration Tests Maven 4.0.0-alpha-5 steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 @@ -14,9 +14,9 @@ jobs: with: java-version: 17 distribution: zulu - - name: Load Maven 4.0.0-alpha-7 - run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-alpha-7 --no-transfer-progress + - name: Load Maven 4.0.0-alpha-5 + run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-alpha-5 --no-transfer-progress - name: Build Setup - run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-7 --no-transfer-progress + run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-5 --no-transfer-progress - name: Integration Test with Maven - run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-7 --no-transfer-progress + run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-5 --no-transfer-progress From 531f4f582365334a526ec9d975bc704aa516b582 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 24 Sep 2023 20:27:28 -0400 Subject: [PATCH 3/5] Revert "[GHA] Try maven 4 alpha 5" This reverts commit ac1e6377fe57d8eff8c0617c4659f17be2a3d309. --- .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 245aa7cc..ee474f21 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-5 +name: Java Integration Tests Maven 4.0.0-alpha-7 on: [push, pull_request] jobs: test: runs-on: ubuntu-latest - name: Integration Tests Maven 4.0.0-alpha-5 + name: Integration Tests Maven 4.0.0-alpha-7 steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 @@ -14,9 +14,9 @@ jobs: with: java-version: 17 distribution: zulu - - name: Load Maven 4.0.0-alpha-5 - run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-alpha-5 --no-transfer-progress + - name: Load Maven 4.0.0-alpha-7 + run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-alpha-7 --no-transfer-progress - name: Build Setup - run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-5 --no-transfer-progress + run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-7 --no-transfer-progress - name: Integration Test with Maven - run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-5 --no-transfer-progress + run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-7 --no-transfer-progress From 59d813a4c4fb881223ddf7a09e89708a784ed842 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 24 Sep 2023 20:27:33 -0400 Subject: [PATCH 4/5] Revert "[GHA] Update maven 4 to alpha 7" This reverts commit a1f222d06eba640ec47bcf85caf3adf2e2df248e. --- .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 ee474f21..c98910e6 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-7 +name: Java Integration Tests Maven 4.0.0-alpha-4 on: [push, pull_request] jobs: test: runs-on: ubuntu-latest - name: Integration Tests Maven 4.0.0-alpha-7 + name: Integration Tests Maven 4.0.0-alpha-4 steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 @@ -14,9 +14,9 @@ jobs: with: java-version: 17 distribution: zulu - - name: Load Maven 4.0.0-alpha-7 - run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-alpha-7 --no-transfer-progress + - name: Load Maven 4.0.0-alpha-4 + run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-alpha-4 --no-transfer-progress - name: Build Setup - run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-7 --no-transfer-progress + run: ./mvnw -B -V clean install -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-4 --no-transfer-progress - name: Integration Test with Maven - run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-7 --no-transfer-progress + run: ./mvnw -B -V -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4 -Dlicense.skip=true -Dmaven.min-version=4.0.0-alpha-4 --no-transfer-progress From 40256e2a00df0c346535343fa5a7294e28b90093 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 24 Sep 2023 20:30:34 -0400 Subject: [PATCH 5/5] [GHA] Fix checkout and update jdks --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/codeql-analysis.yaml | 2 +- .github/workflows/coveralls.yaml | 2 +- .github/workflows/coverity.yaml | 4 ++-- .github/workflows/it-maven-3.3.9.yaml | 4 ++-- .github/workflows/it-maven-4.0.0.yaml | 4 ++-- .github/workflows/it.yaml | 4 ++-- .github/workflows/site.yaml | 4 ++-- .github/workflows/sonar.yaml | 4 ++-- .github/workflows/sonatype.yaml | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 61a5d281..5ceac734 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,13 +8,13 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - java: [11, 17, 20, 21-ea] + java: [11, 17, 21] fail-fast: false max-parallel: 4 name: Test JDK ${{ matrix.java }}, ${{ matrix.os }} steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 05728370..ad3c924e 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -39,7 +39,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index df8a1081..389b363f 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -7,7 +7,7 @@ jobs: if: github.repository_owner == 'spotbugs-OFF' runs-on: ubuntu-latest steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: diff --git a/.github/workflows/coverity.yaml b/.github/workflows/coverity.yaml index b01d874d..9f6c9790 100644 --- a/.github/workflows/coverity.yaml +++ b/.github/workflows/coverity.yaml @@ -10,11 +10,11 @@ jobs: if: github.repository_owner == 'spotbugs' runs-on: ubuntu-latest steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: 'zulu' - name: Analyze with Coverity run: | diff --git a/.github/workflows/it-maven-3.3.9.yaml b/.github/workflows/it-maven-3.3.9.yaml index d16feba0..75953f00 100644 --- a/.github/workflows/it-maven-3.3.9.yaml +++ b/.github/workflows/it-maven-3.3.9.yaml @@ -8,11 +8,11 @@ jobs: name: Integration Tests Maven 3.3.9 steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: zulu - name: Load Maven 3.3.9 run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=3.3.9 --no-transfer-progress diff --git a/.github/workflows/it-maven-4.0.0.yaml b/.github/workflows/it-maven-4.0.0.yaml index c98910e6..62aeaf7a 100644 --- a/.github/workflows/it-maven-4.0.0.yaml +++ b/.github/workflows/it-maven-4.0.0.yaml @@ -8,11 +8,11 @@ jobs: name: Integration Tests Maven 4.0.0-alpha-4 steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: zulu - name: Load Maven 4.0.0-alpha-4 run: ./mvnw -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=4.0.0-alpha-4 --no-transfer-progress diff --git a/.github/workflows/it.yaml b/.github/workflows/it.yaml index d6898d13..6de78174 100644 --- a/.github/workflows/it.yaml +++ b/.github/workflows/it.yaml @@ -8,11 +8,11 @@ jobs: name: Integration Tests steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: zulu - name: Build Setup run: ./mvnw -B -V clean install -Dlicense.skip=true --no-transfer-progress diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml index ce7a7cad..edf837c6 100644 --- a/.github/workflows/site.yaml +++ b/.github/workflows/site.yaml @@ -10,11 +10,11 @@ jobs: if: github.repository_owner == 'spotbugs' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]') runs-on: ubuntu-latest steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: 'zulu' - uses: webfactory/ssh-agent@master with: diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 86756a60..633aaa3c 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -10,14 +10,14 @@ jobs: if: github.repository_owner == 'spotbugs' runs-on: windows-latest steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@v4 with: # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: zulu - name: Analyze with SonarCloud run: ./mvnw verify sonar:sonar -B -V -Dsonar.projectKey=spotbugs_spotbugs-maven-plugin -Dsonar.organization=spotbugs -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index bf100111..32917f70 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -10,11 +10,11 @@ jobs: if: github.repository_owner == 'spotbugs' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]') runs-on: ubuntu-latest steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: 'zulu' - name: Deploy to Sonatype run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true