From 04e68e42f68a5534ab0ad17bebe7a8c1f9d0d542 Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Wed, 13 May 2026 01:21:23 +0800 Subject: [PATCH 1/8] Adjust Maven workflow commands, cache, creds Align Maven commands and tweak workflow settings across CI files. In .github/workflows/maven-build.yml the build step now uses the system 'mvn' and enables 'cache: maven' for setup-java. In .github/workflows/maven-publish.yml the publish step now invokes the wrapper './mvnw' and removed the server-id/username/password and cache entries. These changes harmonize command usage and update caching/credential configuration in the workflows. --- .github/workflows/maven-build.yml | 3 ++- .github/workflows/maven-publish.yml | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 0d4ce187..b8694ba5 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -36,9 +36,10 @@ jobs: with: distribution: 'temurin' java-version: ${{ matrix.java }} + cache: maven - name: Build with Maven - run: ./mvnw + run: mvn --batch-mode --update-snapshots --file pom.xml diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 5ee1f198..c4ff0e44 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -40,13 +40,9 @@ jobs: with: java-version: '11' distribution: 'temurin' - server-id: ossrh - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - cache: maven - name: Publish package - run: mvn + run: ./mvnw --batch-mode --update-snapshots --file pom.xml From aa463e37e9b3a801ae1446092c749ffb4228ca33 Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Wed, 13 May 2026 01:26:36 +0800 Subject: [PATCH 2/8] Fix Java matrix variable casing in CI Update GitHub Actions workflow to use the correct matrix variable and step name. The step name was changed from "Setup JDK ${{ matrix.Java }}" to "Setup Java ${{ matrix.java }}" to match the matrix key casing and ensure the expression is evaluated correctly during the build. --- .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 b8694ba5..4cd65f33 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -31,7 +31,7 @@ jobs: - name: Checkout Source uses: actions/checkout@v5 - - name: Setup JDK ${{ matrix.Java }} + - name: Setup Java ${{ matrix.java }} uses: actions/setup-java@v5 with: distribution: 'temurin' From 7f5bada03b7859f7e22db189f47159037ea91028 Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Thu, 14 May 2026 15:51:03 +0800 Subject: [PATCH 3/8] Add Maven server credentials to publish workflow Add server-id, server-username, and server-password inputs to the setup-java step so MAVEN_USERNAME/MAVEN_PASSWORD are used for authenticated publishing to OSSRH. Ensures the subsequent mvn publish step can authenticate when deploying artifacts to Maven Central. --- .github/workflows/maven-publish.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index c4ff0e44..44dcf9c5 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -40,6 +40,9 @@ jobs: with: java-version: '11' distribution: 'temurin' + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD - name: Publish package run: ./mvnw From aa161ae3ee8f720ed9c939804ee9246634613842 Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Thu, 21 May 2026 17:36:59 +0800 Subject: [PATCH 4/8] Bump parent POM version to 0.2.9 Update parent artifact io.github.microsphere-projects:microsphere-build in pom.xml from 0.2.7 to 0.2.9 so the project inherits the latest build configuration and fixes from the newer parent version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 05e04f76..cedaf2df 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.github.microsphere-projects microsphere-build - 0.2.7 + 0.2.9 4.0.0 From ff561772c79f2a7501777ac65aa0961ed7135b8a Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Thu, 21 May 2026 17:37:08 +0800 Subject: [PATCH 5/8] Bump JUnit Jupiter to 5.14.4 Update junit-jupiter.version in microsphere-spring-boot-parent/pom.xml from 5.14.3 to 5.14.4 to adopt the latest patch release for testing dependencies. --- microsphere-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microsphere-spring-boot-parent/pom.xml b/microsphere-spring-boot-parent/pom.xml index 7d503fda..b33cea78 100644 --- a/microsphere-spring-boot-parent/pom.xml +++ b/microsphere-spring-boot-parent/pom.xml @@ -22,7 +22,7 @@ 0.1.15 1.7.2 - 5.14.3 + 5.14.4 From a5041cf1c7bb6472668473cf8784b44301f6aca3 Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Thu, 21 May 2026 17:38:18 +0800 Subject: [PATCH 6/8] Bump branch latest versions in README Update README table to reflect new latest patch versions for branches: 0.2.x -> 0.2.13 and 0.1.x -> 0.1.13. Documentation-only change to keep branch version info current. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 65637c12..d1b75092 100644 --- a/README.md +++ b/README.md @@ -61,8 +61,8 @@ pom.xml: | **Branches** | **Purpose** | **Latest Version** | |--------------|--------------------------------------------------|--------------------| -| **0.2.x** | Compatible with Spring Boot 3.0.x - 3.5.x, 4.0.x | 0.2.12 | -| **0.1.x** | Compatible with Spring Boot 2.0.x - 2.7.x | 0.1.12 | +| **0.2.x** | Compatible with Spring Boot 3.0.x - 3.5.x, 4.0.x | 0.2.13 | +| **0.1.x** | Compatible with Spring Boot 2.0.x - 2.7.x | 0.1.13 | Then add the specific modules you need: From d267d74c6e38464e4713c4084a2a20d173b88413 Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Thu, 21 May 2026 18:34:02 +0800 Subject: [PATCH 7/8] Bump microsphere-spring.version to 0.1.16 Update microsphere-spring.version in microsphere-spring-boot-parent/pom.xml from 0.1.15 to 0.1.16 to pick up the latest microsphere-spring release (bug fixes/improvements). --- microsphere-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microsphere-spring-boot-parent/pom.xml b/microsphere-spring-boot-parent/pom.xml index b33cea78..be5d03ea 100644 --- a/microsphere-spring-boot-parent/pom.xml +++ b/microsphere-spring-boot-parent/pom.xml @@ -19,7 +19,7 @@ Microsphere Spring Boot Parent - 0.1.15 + 0.1.16 1.7.2 5.14.4 From b696c6fc633712a30b483c35053cdfb5c15bea72 Mon Sep 17 00:00:00 2001 From: Mercy Ma Date: Thu, 21 May 2026 18:38:07 +0800 Subject: [PATCH 8/8] Remove max-parallel from Maven build workflow Delete the explicit `max-parallel: 7` setting in .github/workflows/maven-build.yml for the build job strategy. The matrix of Java and Maven profiles is unchanged; this lets GitHub Actions use its default concurrency behavior (or be controlled elsewhere) instead of the hard limit. --- .github/workflows/maven-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 4cd65f33..77b779a5 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -21,7 +21,6 @@ jobs: build: runs-on: ubuntu-latest strategy: - max-parallel: 7 matrix: java: [ '8', '11' , '17' , '21' , '25' ] maven-profile-spring-boot: [ 'spring-boot-2.1' , 'spring-boot-2.2' , 'spring-boot-2.3',