This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new ad0b3bcb69a Upgrade jakarta persistence and spring framework
dependencies to match the spring boot version in example (#38020)
ad0b3bcb69a is described below
commit ad0b3bcb69a918ea1f3ce9bb9eb447befade909e
Author: Raigor <[email protected]>
AuthorDate: Thu Feb 12 16:54:48 2026 +0800
Upgrade jakarta persistence and spring framework dependencies to match the
spring boot version in example (#38020)
---
.../resources/template/java/entity/Address.ftl | 12 ++++-----
.../main/resources/template/java/entity/Order.ftl | 12 ++++-----
.../resources/template/java/entity/OrderItem.ftl | 12 ++++-----
.../java/repository/jpa/AddressRepository.ftl | 6 ++---
.../java/repository/jpa/OrderItemRepository.ftl | 6 ++---
.../java/repository/jpa/OrderRepository.ftl | 6 ++---
.../src/main/resources/template/pom.ftl | 29 +++++++++-------------
.../template/resources/properties/application.ftl | 2 +-
8 files changed, 40 insertions(+), 45 deletions(-)
diff --git
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/entity/Address.ftl
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/entity/Address.ftl
index 386106a3272..af43c030e0a 100644
---
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/entity/Address.ftl
+++
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/entity/Address.ftl
@@ -19,12 +19,12 @@
package org.apache.shardingsphere.example.${package}.${framework?replace('-',
'.')}.entity;
<#if framework?contains("jpa")>
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
</#if>
import java.io.Serializable;
diff --git
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/entity/Order.ftl
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/entity/Order.ftl
index a736ced64dc..508c272e28d 100644
---
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/entity/Order.ftl
+++
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/entity/Order.ftl
@@ -19,12 +19,12 @@
package org.apache.shardingsphere.example.${package}.${framework?replace('-',
'.')}.entity;
<#if framework?contains("jpa")>
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
</#if>
import java.io.Serializable;
diff --git
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/entity/OrderItem.ftl
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/entity/OrderItem.ftl
index bc14b544758..de6159b03ab 100644
---
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/entity/OrderItem.ftl
+++
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/entity/OrderItem.ftl
@@ -19,12 +19,12 @@
package org.apache.shardingsphere.example.${package}.${framework?replace('-',
'.')}.entity;
<#if framework?contains("jpa")>
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
</#if>
import java.io.Serializable;
diff --git
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/repository/jpa/AddressRepository.ftl
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/repository/jpa/AddressRepository.ftl
index ff3cd1431f1..a6e4d3f735e 100644
---
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/repository/jpa/AddressRepository.ftl
+++
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/repository/jpa/AddressRepository.ftl
@@ -22,9 +22,9 @@ import
org.apache.shardingsphere.example.${package}.${framework?replace('-', '.'
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Repository;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
import java.util.List;
@Repository
diff --git
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/repository/jpa/OrderItemRepository.ftl
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/repository/jpa/OrderItemRepository.ftl
index bd6d26bfa1f..c3adaff1501 100644
---
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/repository/jpa/OrderItemRepository.ftl
+++
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/repository/jpa/OrderItemRepository.ftl
@@ -22,9 +22,9 @@ import
org.apache.shardingsphere.example.${package}.${framework?replace('-', '.'
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Repository;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
import java.util.List;
@Repository
diff --git
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/repository/jpa/OrderRepository.ftl
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/repository/jpa/OrderRepository.ftl
index e2799545369..3ff7b2cd938 100644
---
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/repository/jpa/OrderRepository.ftl
+++
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/java/repository/jpa/OrderRepository.ftl
@@ -22,9 +22,9 @@ import
org.apache.shardingsphere.example.${package}.${framework?replace('-', '.'
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Repository;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
import java.util.List;
@Repository
diff --git
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/pom.ftl
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/pom.ftl
index 99e7711c78f..18311e606da 100644
---
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/pom.ftl
+++
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/pom.ftl
@@ -175,29 +175,24 @@
</#if>
<#if framework?contains("jpa")>
<dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.1-api</artifactId>
- <version>1.0.0.Final</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>5.4.24.Final</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>5.4.24.Final</version>
+ <version>6.4.4.Final</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>5.2.15.RELEASE</version>
+ <version>6.1.16</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>5.2.15.RELEASE</version>
+ <version>6.1.16</version>
</dependency>
</#if>
<#if framework=="spring-boot-starter-jdbc">
@@ -233,12 +228,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>5.2.15.RELEASE</version>
+ <version>6.1.16</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>5.2.15.RELEASE</version>
+ <version>6.1.16</version>
</dependency>
<#elseif framework=="spring-namespace-mybatis">
<dependency>
@@ -254,12 +249,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>5.2.15.RELEASE</version>
+ <version>6.1.16</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>5.2.15.RELEASE</version>
+ <version>6.1.16</version>
</dependency>
<#elseif framework?contains("spring-boot-starter")>
<dependency>
@@ -336,8 +331,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
</plugins>
diff --git
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/properties/application.ftl
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/properties/application.ftl
index 23924509970..7a7f2e7f851 100644
---
a/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/properties/application.ftl
+++
b/examples/shardingsphere-jdbc-example-generator/src/main/resources/template/resources/properties/application.ftl
@@ -19,7 +19,7 @@
mybatis.mapper-locations=classpath*:mappers/*Mapper.xml
<#elseif framework?contains("jpa")>
spring.jpa.properties.hibernate.hbm2ddl.auto=create-drop
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
spring.jpa.properties.hibernate.show_sql=false
</#if>
