From 5c84be7859c9c239d27ed3d834faaf1d7af72c1b Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Wed, 13 May 2026 01:28:14 +0800
Subject: [PATCH 1/5] Adjust CI Java setup and Maven wrapper usage

Update GitHub Actions workflows to improve Java/Maven configuration:

- .github/workflows/maven-build.yml: rename the step title to "Setup Java", use matrix.java, enable actions/setup-java maven cache, and switch the build step to use the system mvn command.
- .github/workflows/maven-publish.yml: remove server credential and cache inputs from the setup-java step, and switch the publish step to use the Maven wrapper (./mvnw).

These changes standardize variable names, enable the setup-java maven cache for faster builds, and adjust when the wrapper vs. system Maven is used. Credentials and publishing behavior should be managed outside the setup step as needed.
---
 .github/workflows/maven-build.yml   | 5 +++--
 .github/workflows/maven-publish.yml | 6 +-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index fb851f6..dc0a08e 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -33,14 +33,15 @@ jobs:
         with:
           token: ${{ secrets.TC_CLOUD_TOKEN }}
 
-      - name: Setup JDK ${{ matrix.Java }}
+      - name: Setup Java ${{ matrix.java }}
         uses: actions/setup-java@v5
         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 94e900a..8448c7f 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 fe02ac5411e20f89ee78ca0893f387c56b77bb60 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 14 May 2026 15:52:57 +0800
Subject: [PATCH 2/5] Configure Maven server auth and use Maven wrapper

          server-id: ossrh
          server-username: MAVEN_USERNAME
          server-password: MAVEN_PASSWORD
---
 .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 8448c7f..c16196e 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 931983851ce41bf757580352a4fb560b674e9cec Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 21 May 2026 17:43:59 +0800
Subject: [PATCH 3/5] Bump parent version to 0.2.9

Update pom.xml to use io.github.microsphere-projects:microsphere-build parent version 0.2.9 (was 0.2.7) to pick up the latest build configuration and dependency management changes.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7fdaa3f..33d4ecf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.github.microsphere-projects</groupId>
         <artifactId>microsphere-build</artifactId>
-        <version>0.2.7</version>
+        <version>0.2.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

From 9e40411999825734195b0541948ac0f054fdbcd7 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 21 May 2026 17:44:07 +0800
Subject: [PATCH 4/5] Bump JUnit Jupiter to 5.14.4

Update junit-jupiter.version in the parent POM from 5.14.3 to 5.14.4 to use the latest JUnit 5 patch release for project tests.
---
 microsphere-spring-cloud-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsphere-spring-cloud-parent/pom.xml b/microsphere-spring-cloud-parent/pom.xml
index 69ced22..36e21bc 100644
--- a/microsphere-spring-cloud-parent/pom.xml
+++ b/microsphere-spring-cloud-parent/pom.xml
@@ -23,7 +23,7 @@
         <microsphere-spring-boot.version>0.1.12</microsphere-spring-boot.version>
         <testcontainers.version>1.21.4</testcontainers.version>
         <!-- Testing -->
-        <junit-jupiter.version>5.14.3</junit-jupiter.version>
+        <junit-jupiter.version>5.14.4</junit-jupiter.version>
     </properties>
 
     <dependencyManagement>

From cd39772efe4a210433d8c499e6c91d1154f0e2e5 Mon Sep 17 00:00:00 2001
From: Mercy Ma <mercyblitz@gmail.com>
Date: Thu, 21 May 2026 18:50:50 +0800
Subject: [PATCH 5/5] Bump microsphere-spring-boot to 0.1.13

Update microsphere-spring-boot.version in microsphere-spring-cloud-parent/pom.xml from 0.1.12 to 0.1.13 so modules inheriting this parent use the newer release.
---
 microsphere-spring-cloud-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsphere-spring-cloud-parent/pom.xml b/microsphere-spring-cloud-parent/pom.xml
index 36e21bc..d8b0467 100644
--- a/microsphere-spring-cloud-parent/pom.xml
+++ b/microsphere-spring-cloud-parent/pom.xml
@@ -20,7 +20,7 @@
 
     <properties>
         <!-- BOM versions -->
-        <microsphere-spring-boot.version>0.1.12</microsphere-spring-boot.version>
+        <microsphere-spring-boot.version>0.1.13</microsphere-spring-boot.version>
         <testcontainers.version>1.21.4</testcontainers.version>
         <!-- Testing -->
         <junit-jupiter.version>5.14.4</junit-jupiter.version>