Merge pull request #4 from mercyblitz/dev-1.x

Adapt Hibernate APIs, update CI workflows, and enhance README

Author: mercyblitz

.github/scripts/generate-wiki-docs.py

@@ -13,28 +13,25 @@ permissions:
 
 on:
   push:
-    branches: [ 'main' , 'dev' ]
+    branches: [ 'dev-1.x' ]
   pull_request:
-    branches: [ 'main', 'dev' , 'release' ]
+    branches: [ 'dev-1.x' , 'release-1.x' ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '17' , '21' , '25' ]
-        maven-profile-spring-cloud: [ 'spring-cloud-2022' , 'spring-cloud-2023' , 'spring-cloud-2024' ,
-                                      'spring-cloud-2025' ]
-        maven-hibernate: [ 'hibernate-7.3' , 'hibernate-7.2' , 'hibernate-7.1' , 'hibernate-7.0' ,
-                           'hibernate-6.6' , 'hibernate-6.5' , 'hibernate-6.4' , 'hibernate-6.3' ,
-                           'hibernate-6.2'
-        ]
+        java: [ '8', '11' , '17' , '21' , '25' ]
+        maven-profile-spring-cloud: [ 'spring-cloud-hoxton' , 'spring-cloud-2020' , 'spring-cloud-2021' ]
+        maven-hibernate: [ 'hibernate-5.6' , 'hibernate-5.5' , 'hibernate-5.4' , 'hibernate-5.3' ,
+                           'hibernate-5.2' , 'hibernate-5.1' , 'hibernate-5.0' ]
 
     steps:
       - 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'

.github/workflows/maven-build.yml

@@ -10,11 +10,11 @@ name: Maven Publish
 
 on:
   push:
-    branches: [ 'release' ]
+    branches: [ 'release-1.x' ]
   workflow_dispatch:
     inputs:
       revision:
-        description: 'The version to publish for Spring Cloud 2022+ and JDK 17+'
+        description: 'The version to publish for Spring Cloud Hoxton to 2021'
         required: true
         default: '${major}.${minor}.${patch}'
 
@@ -47,7 +47,6 @@ jobs:
           --update-snapshots
           --file pom.xml
           -Drevision=${{ inputs.revision }}
-          -Dsurefire.useSystemClassLoader=false
           -Dgpg.skip=true
           deploy
           --activate-profiles publish,ci
@@ -195,16 +194,16 @@ jobs:
           git diff --cached --quiet && echo "No changes to commit" || \
             git commit -m "chore: bump version to next patch after publishing ${{ inputs.revision }}" && git push
 
-      - name: Merge release into main
+      - name: Merge release-1.x into dev-1.x
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-          if ! git checkout main; then
-            echo "::error::Branch 'main' does not exist. Skipping merge."
+          if ! git checkout dev-1.x; then
+            echo "::error::Branch 'dev-1.x' does not exist. Skipping merge."
             exit 1
           fi
-          if ! git merge --no-ff origin/release -m "chore: merge release into main [skip ci]"; then
-            echo "::error::Merge conflict detected when merging release into main. Manual intervention required."
+          if ! git merge --no-ff origin/release-1.x -m "chore: merge release-1.x into dev-1.x [skip ci]"; then
+            echo "::error::Merge conflict detected when merging release-1.x into dev-1.x. Manual intervention required."
             exit 1
           fi
-          git push origin main
+          git push origin dev-1.x

.github/workflows/maven-publish.yml

@@ -4,7 +4,7 @@
 
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/microsphere-projects/microsphere-hibernate)
 [![Maven Build](https://github.com/microsphere-projects/microsphere-hibernate/actions/workflows/maven-build.yml/badge.svg)](https://github.com/microsphere-projects/microsphere-hibernate/actions/workflows/maven-build.yml)
-[![Codecov](https://codecov.io/gh/microsphere-projects/microsphere-hibernate/branch/main/graph/badge.svg)](https://app.codecov.io/gh/microsphere-projects/microsphere-hibernate)
+[![Codecov](https://codecov.io/gh/microsphere-projects/microsphere-hibernate/branch/dev-1.x/graph/badge.svg)](https://app.codecov.io/gh/microsphere-projects/microsphere-hibernate)
 ![Maven](https://img.shields.io/maven-central/v/io.github.microsphere-projects/microsphere-hibernate.svg)
 ![License](https://img.shields.io/github/license/microsphere-projects/microsphere-hibernate.svg)
 
@@ -47,6 +47,20 @@ pom.xml:
 | **0.2.x**    | Compatible with Spring Cloud 2022.0.x - 2025.0.x | 0.2.0              |
 | **0.1.x**    | Compatible with Spring Cloud Hoxton - 2021.0.x   | 0.1.0              |
 
+### Compatibility
+
+| **Branch 0.2.x**   | **Min Version** | **Max Version** |
+|--------------------|-----------------|-----------------|
+| **JDK**            | 17              | 25              |
+| **Spring Cloud**   | 2022.0.x        | 2025.0.x        |
+| **Hibernate Core** | 6.2.x           | 7.3.x           |
+
+| **Branch 0.1.x**   | **Min Version** | **Max Version** |
+|--------------------|-----------------|-----------------|
+| **JDK**            | 8               | 25              |
+| **Spring Cloud**   | Hoxton          | 2021.0.x        |
+| **Hibernate Core** | 5.0.x           | 5.6.x           |
+
 ## Building from Source
 
 You don't need to build from source unless you want to try out the latest code or contribute to the project.

.github/workflows/merge-main-to-branches.yml

@@ -35,7 +35,7 @@
 
         <!-- Hibernate -->
         <dependency>
-            <groupId>org.hibernate.orm</groupId>
+            <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
             <optional>true</optional>
         </dependency>