From 3f29207ad1b8881068fa0c410c6700f85f325b8d Mon Sep 17 00:00:00 2001 From: petruki <31597636+petruki@users.noreply.github.com> Date: Mon, 29 Sep 2025 20:53:47 -0700 Subject: [PATCH] chore: added JDK 25 to test matrix --- .github/workflows/master-2.yml | 8 ++++---- .github/workflows/master.yml | 8 ++++---- .github/workflows/release.yml | 6 +++--- .github/workflows/sonar.yml | 7 ++++--- pom.xml | 4 ++-- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/master-2.yml b/.github/workflows/master-2.yml index 06d1478..23d7388 100644 --- a/.github/workflows/master-2.yml +++ b/.github/workflows/master-2.yml @@ -9,7 +9,7 @@ on: jobs: build-scan: name: SonarCloud Scan - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 @@ -27,15 +27,15 @@ jobs: env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} if: env.SONAR_TOKEN != '' - run: mvn -B clean verify -Pcoverage,sonar -Dsonar.token=${{ secrets.SONAR_TOKEN }} + run: mvn -B clean verify -Pcoverage,sonar -Dsonar.token=$SONAR_TOKEN build-test: name: Build & Test - JDK ${{ matrix.java }} on ${{ matrix.os }} strategy: fail-fast: false matrix: - java: ['11', '17', '21'] - os: [ubuntu-22.04, windows-latest] + java: ['11', '17', '21', '25'] + os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 7456ab7..33c6735 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -9,7 +9,7 @@ on: jobs: build-scan: name: SonarCloud Scan - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 @@ -27,15 +27,15 @@ jobs: env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} if: env.SONAR_TOKEN != '' - run: mvn -B clean verify -Pcoverage,sonar -Dsonar.token=${{ secrets.SONAR_TOKEN }} + run: mvn -B clean verify -Pcoverage,sonar -Dsonar.token=$SONAR_TOKEN build-test: name: Build & Test - JDK ${{ matrix.java }} on ${{ matrix.os }} strategy: fail-fast: false matrix: - java: ['8', '11', '17', '21'] - os: [ubuntu-22.04, windows-latest] + java: ['8', '11', '17', '21', '25'] + os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9b843c6..9a5dd90 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,8 +10,8 @@ jobs: strategy: fail-fast: false matrix: - java: ['11', '17', '21'] - os: [ubuntu-22.04, windows-latest] + java: ['11', '17', '21', '25'] + os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} steps: @@ -39,7 +39,7 @@ jobs: publish: name: Publish Release needs: [build-test] - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index c98281c..3ae8f2b 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -11,7 +11,7 @@ on: jobs: sonar-analysis: name: SonarCloud Analysis for PR - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Get PR details @@ -43,10 +43,11 @@ jobs: - name: Build/Test & SonarCloud Scan env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + PR_ID: ${{ inputs.pr_id }} if: env.SONAR_TOKEN != '' run: | mvn -B clean verify -Pcoverage,sonar \ - -Dsonar.token=${{ secrets.SONAR_TOKEN }} \ - -Dsonar.pullrequest.key=${{ inputs.pr_id }} \ + -Dsonar.token=$SONAR_TOKEN \ + -Dsonar.pullrequest.key=$PR_ID \ -Dsonar.pullrequest.branch=${{ steps.pr.outputs.head_ref }} \ -Dsonar.pullrequest.base=${{ steps.pr.outputs.base_ref }} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 23cbb77..301b2f0 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 2.13.2 - 3.18.0 + 3.19.0 3.12.0 2.0.17 @@ -69,7 +69,7 @@ 3.12.0 3.5.4 3.2.8 - 3.11.0.3922 + 5.2.0.4988 0.8.13 0.8.0