From a5d665ea93c54de54ef8714f52cd441977bc8136 Mon Sep 17 00:00:00 2001
From: petruki <31597636+petruki@users.noreply.github.com>
Date: Sat, 8 Aug 2026 14:28:30 -0700
Subject: [PATCH 1/2] chore(deps): bump test and plugin deps
---
.github/workflows/master.yml | 6 +++---
.github/workflows/release.yml | 6 +++---
.github/workflows/sonar.yml | 4 ++--
pom.xml | 18 +++++++++---------
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 964f46e..28c9c87 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v5
+ - uses: actions/checkout@v7
with:
fetch-depth: 0
@@ -39,7 +39,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- - uses: actions/checkout@v5
+ - uses: actions/checkout@v7
- name: Setup Java
uses: actions/setup-java@v5
@@ -51,7 +51,7 @@ jobs:
run: mvn -version
- name: Cache Maven packages
- uses: actions/cache@v4
+ uses: actions/cache@v5
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2-${{ matrix.java }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 93476cf..d534b56 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- - uses: actions/checkout@v5
+ - uses: actions/checkout@v7
- name: Setup Java
uses: actions/setup-java@v5
@@ -27,7 +27,7 @@ jobs:
run: mvn -version
- name: Cache Maven packages
- uses: actions/cache@v4
+ uses: actions/cache@v5
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2-${{ matrix.java }}
@@ -42,7 +42,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v5
+ - uses: actions/checkout@v7
- name: Set up Apache Maven Central
uses: actions/setup-java@v5
with:
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index 3203b11..c731cd8 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -16,7 +16,7 @@ jobs:
steps:
- name: Get PR details
id: pr
- uses: actions/github-script@v7
+ uses: actions/github-script@v9
with:
script: |
const pr = await github.rest.pulls.get({
@@ -28,7 +28,7 @@ jobs:
core.setOutput('base_ref', pr.data.base.ref);
core.setOutput('head_sha', pr.data.head.sha);
- - uses: actions/checkout@v5
+ - uses: actions/checkout@v7
with:
ref: ${{ steps.pr.outputs.head_sha }}
fetch-depth: 0
diff --git a/pom.xml b/pom.xml
index 1077348..ef6eecf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,18 +47,18 @@
UTF-8
- 5.13.4
- 1.18.30
+ 6.1.2
+ 1.18.46
- 0.8.13
- 3.11.0.3922
- 3.14.0
- 3.3.1
- 3.5.3
- 3.11.2
+ 0.8.15
+ 5.7.0.6970
+ 3.15.0
+ 3.4.0
+ 3.5.6
+ 3.12.0
3.2.8
- 0.8.0
+ 0.11.0
jacoco
From 4218a2ca5ed4b6761416430fb3bf5f5c1584324c Mon Sep 17 00:00:00 2001
From: petruki <31597636+petruki@users.noreply.github.com>
Date: Sat, 8 Aug 2026 14:38:03 -0700
Subject: [PATCH 2/2] fix(ci): sonar input/secrets
---
.github/workflows/master.yml | 2 +-
.github/workflows/sonar.yml | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 28c9c87..78de627 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -27,7 +27,7 @@ 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 }}
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index c731cd8..232fe3d 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -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
+ -Dsonar.pullrequest.base=${{ steps.pr.outputs.base_ref }}