From 56f0140ac0377f99b80c73dc8948608943f54920 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 31 Mar 2026 09:50:53 +0800 Subject: [PATCH 1/2] Add dependabot and update git actions --- .github/dependabot.yml | 19 +++++++++++++++++++ .github/workflows/maven-build.yml | 9 +++++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..eea7013 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,19 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +version: 2 +updates: + - package-ecosystem: "maven" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major","version-update:semver-minor"] + + - package-ecosystem: "github-actions" # Also update Github actions + directory: "/" + schedule: + # Check for updates to GitHub Actions every week + interval: "weekly" diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 03dffaa..8ba79b6 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -25,6 +25,7 @@ on: branches: - main - master + - '1.x' workflow_dispatch: @@ -35,16 +36,16 @@ jobs: env: MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 11 for x64 - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: java-version: '11' distribution: 'temurin' architecture: x64 - - uses: s4u/maven-settings-action@v2.8.0 + - uses: s4u/maven-settings-action@v4.0.0 with: sonatypeSnapshots: true @@ -52,7 +53,7 @@ jobs: run: mvn -B -V clean verify -Prun-its -Pci - - uses: s4u/maven-settings-action@v2.8.0 + - uses: s4u/maven-settings-action@v4.0.0 if: ${{ github.event_name == 'push' }} with: servers: | From 538f1b68693825a04a3ff00d2e73eebfc84135ba Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 31 Mar 2026 09:52:01 +0800 Subject: [PATCH 2/2] Upgrade java version to 17 in build env --- .github/workflows/maven-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 8ba79b6..6dcc2fc 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -41,7 +41,7 @@ jobs: - name: Set up JDK 11 for x64 uses: actions/setup-java@v5 with: - java-version: '11' + java-version: '17' distribution: 'temurin' architecture: x64