Merge pull request #922 from abel533/5.x

5.x - 基于jdk17和spring boot3
abel533 · Aug 21, 2024 · 80833f9 · 80833f9
2 parents 41e1feb + cf801a4
commit 80833f9
Show file tree

Hide file tree

Showing 97 changed files with 2,200 additions and 859 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v2
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: ossrh
           server-username: MAVEN_USERNAME

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v2
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
       - name: Run the Maven verify phase
         run: mvn --batch-mode --update-snapshots -P dev test
diff --git a/all/mapper/pom.xml b/all/mapper/pom.xml
@@ -39,8 +39,8 @@
     <dependencies>
         <!--必须依赖-->
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
         <dependency>
             <groupId>tk.mybatis</groupId>
@@ -79,7 +79,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

diff --git a/all/pom.xml b/all/pom.xml
@@ -87,7 +87,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
-                <version>1.1.0</version>
+                <version>1.6.0</version>
                 <configuration>
                     <updatePomFile>true</updatePomFile>
                     <flattenMode>bom</flattenMode>

diff --git a/base/pom.xml b/base/pom.xml
@@ -40,8 +40,8 @@
     <dependencies>
         <!--必须依赖-->
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
 
         <dependency>
@@ -58,9 +58,9 @@
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.21</version>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.0.33</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/base/src/test/java/tk/mybatis/mapper/base/Country.java b/base/src/test/java/tk/mybatis/mapper/base/Country.java
@@ -24,7 +24,7 @@
 
 package tk.mybatis.mapper.base;
 
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 
 /**

diff --git a/base/src/test/java/tk/mybatis/mapper/base/genid/Country.java b/base/src/test/java/tk/mybatis/mapper/base/genid/Country.java
@@ -26,7 +26,7 @@
 
 import tk.mybatis.mapper.annotation.KeySql;
 
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 
 /**

diff --git a/base/src/test/java/tk/mybatis/mapper/base/genid/User.java b/base/src/test/java/tk/mybatis/mapper/base/genid/User.java
@@ -2,7 +2,7 @@
 
 import tk.mybatis.mapper.annotation.KeySql;
 
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 
 /**
  * @author liuzh

diff --git a/base/src/test/java/tk/mybatis/mapper/defaultenumtypehandler/User.java b/base/src/test/java/tk/mybatis/mapper/defaultenumtypehandler/User.java
@@ -1,6 +1,6 @@
 package tk.mybatis.mapper.defaultenumtypehandler;
 
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 
 /**

diff --git a/base/src/test/java/tk/mybatis/mapper/generatedvalue/UserAutoIncrement.java b/base/src/test/java/tk/mybatis/mapper/generatedvalue/UserAutoIncrement.java
@@ -1,9 +1,9 @@
 package tk.mybatis.mapper.generatedvalue;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  * @author liuzh

diff --git a/base/src/test/java/tk/mybatis/mapper/generatedvalue/UserAutoIncrementIdentity.java b/base/src/test/java/tk/mybatis/mapper/generatedvalue/UserAutoIncrementIdentity.java
@@ -1,6 +1,6 @@
 package tk.mybatis.mapper.generatedvalue;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 /**
  * @author liuzh

diff --git a/base/src/test/java/tk/mybatis/mapper/generatedvalue/UserSqlAfter.java b/base/src/test/java/tk/mybatis/mapper/generatedvalue/UserSqlAfter.java
@@ -1,6 +1,6 @@
 package tk.mybatis.mapper.generatedvalue;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 /**
  * @author liuzh

diff --git a/base/src/test/java/tk/mybatis/mapper/helper/FieldHelperTest.java b/base/src/test/java/tk/mybatis/mapper/helper/FieldHelperTest.java
@@ -29,7 +29,7 @@
 import tk.mybatis.mapper.mapperhelper.FieldHelper;
 import tk.mybatis.mapper.model.Country;
 
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 import java.beans.IntrospectionException;
 import java.util.List;
 

diff --git a/base/src/test/java/tk/mybatis/mapper/helper/FieldTest.java b/base/src/test/java/tk/mybatis/mapper/helper/FieldTest.java
@@ -29,8 +29,8 @@
 import tk.mybatis.mapper.mapperhelper.FieldHelper;
 import tk.mybatis.mapper.model.Country;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
 import java.beans.Introspector;

diff --git a/base/src/test/java/tk/mybatis/mapper/issues/_216_datetime/TimeModel.java b/base/src/test/java/tk/mybatis/mapper/issues/_216_datetime/TimeModel.java
@@ -1,7 +1,7 @@
 package tk.mybatis.mapper.issues._216_datetime;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
 

diff --git a/base/src/test/java/tk/mybatis/mapper/issues/_216_datetime/TimeModel2.java b/base/src/test/java/tk/mybatis/mapper/issues/_216_datetime/TimeModel2.java
@@ -1,7 +1,7 @@
 package tk.mybatis.mapper.issues._216_datetime;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Date;

diff --git a/base/src/test/java/tk/mybatis/mapper/issues/_216_datetime/TimeModel3.java b/base/src/test/java/tk/mybatis/mapper/issues/_216_datetime/TimeModel3.java
@@ -3,8 +3,8 @@
 import org.apache.ibatis.type.JdbcType;
 import tk.mybatis.mapper.annotation.ColumnType;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
 

diff --git a/base/src/test/java/tk/mybatis/mapper/keysql/UserAutoIncrement.java b/base/src/test/java/tk/mybatis/mapper/keysql/UserAutoIncrement.java
@@ -2,9 +2,9 @@
 
 import tk.mybatis.mapper.annotation.KeySql;
 
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  * @author liuzh

diff --git a/base/src/test/java/tk/mybatis/mapper/keysql/UserAutoIncrementIdentity.java b/base/src/test/java/tk/mybatis/mapper/keysql/UserAutoIncrementIdentity.java
@@ -3,9 +3,9 @@
 import tk.mybatis.mapper.annotation.KeySql;
 import tk.mybatis.mapper.code.IdentityDialect;
 
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  * @author liuzh

diff --git a/base/src/test/java/tk/mybatis/mapper/keysql/UserSqlAfter.java b/base/src/test/java/tk/mybatis/mapper/keysql/UserSqlAfter.java
@@ -3,9 +3,9 @@
 import tk.mybatis.mapper.annotation.KeySql;
 import tk.mybatis.mapper.code.ORDER;
 
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  * @author liuzh

diff --git a/base/src/test/java/tk/mybatis/mapper/keysql/UserSqlBefore.java b/base/src/test/java/tk/mybatis/mapper/keysql/UserSqlBefore.java
@@ -3,8 +3,8 @@
 import tk.mybatis.mapper.annotation.KeySql;
 import tk.mybatis.mapper.code.ORDER;
 
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  * @author liuzh

diff --git a/base/src/test/java/tk/mybatis/mapper/model/BaseLogicDelete.java b/base/src/test/java/tk/mybatis/mapper/model/BaseLogicDelete.java
@@ -2,10 +2,10 @@
 
 import tk.mybatis.mapper.annotation.LogicDelete;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 public class BaseLogicDelete {
 

diff --git a/base/src/test/java/tk/mybatis/mapper/model/Country.java b/base/src/test/java/tk/mybatis/mapper/model/Country.java
@@ -27,8 +27,8 @@
 import tk.mybatis.mapper.annotation.Order;
 import tk.mybatis.mapper.entity.IDynamicTableName;
 
-import javax.persistence.Column;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.Transient;
 import java.io.Serializable;
 import java.util.List;
 

diff --git a/base/src/test/java/tk/mybatis/mapper/model/Country2.java b/base/src/test/java/tk/mybatis/mapper/model/Country2.java
@@ -24,9 +24,9 @@
 
 package tk.mybatis.mapper.model;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 /**
  * Description: Country

diff --git a/base/src/test/java/tk/mybatis/mapper/model/CountryI.java b/base/src/test/java/tk/mybatis/mapper/model/CountryI.java
@@ -27,9 +27,9 @@
 import tk.mybatis.mapper.annotation.NameStyle;
 import tk.mybatis.mapper.code.Style;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 /**
  * Description: Country

diff --git a/base/src/test/java/tk/mybatis/mapper/model/CountryJDBC.java b/base/src/test/java/tk/mybatis/mapper/model/CountryJDBC.java
@@ -24,9 +24,9 @@
 
 package tk.mybatis.mapper.model;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  * Description: Country

diff --git a/base/src/test/java/tk/mybatis/mapper/model/CountryT.java b/base/src/test/java/tk/mybatis/mapper/model/CountryT.java
@@ -24,8 +24,8 @@
 
 package tk.mybatis.mapper.model;
 
-import javax.persistence.Id;
-import javax.persistence.Transient;
+import jakarta.persistence.Id;
+import jakarta.persistence.Transient;
 
 /**
  * Description: Country

diff --git a/base/src/test/java/tk/mybatis/mapper/model/CountryVersion.java b/base/src/test/java/tk/mybatis/mapper/model/CountryVersion.java
@@ -26,7 +26,7 @@
 
 import tk.mybatis.mapper.annotation.Version;
 
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 /**
  * Description: Country

diff --git a/base/src/test/java/tk/mybatis/mapper/model/Entity.java b/base/src/test/java/tk/mybatis/mapper/model/Entity.java
@@ -26,8 +26,8 @@
 
 import tk.mybatis.mapper.annotation.Order;
 
-import javax.persistence.Id;
-import javax.persistence.Transient;
+import jakarta.persistence.Id;
+import jakarta.persistence.Transient;
 import java.io.Serializable;
 
 /**

diff --git a/base/src/test/java/tk/mybatis/mapper/model/TbUser.java b/base/src/test/java/tk/mybatis/mapper/model/TbUser.java
@@ -1,6 +1,6 @@
 package tk.mybatis.mapper.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Table(name = "tb_user")
 public class TbUser {

diff --git a/base/src/test/java/tk/mybatis/mapper/model/TbUserLogicDelete.java b/base/src/test/java/tk/mybatis/mapper/model/TbUserLogicDelete.java
@@ -1,7 +1,7 @@
 package tk.mybatis.mapper.model;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Table;
 
 @Table(name = "tb_user")
 public class TbUserLogicDelete extends BaseLogicDelete {

diff --git a/base/src/test/java/tk/mybatis/mapper/model/UserInfo.java b/base/src/test/java/tk/mybatis/mapper/model/UserInfo.java
@@ -24,9 +24,9 @@
 
 package tk.mybatis.mapper.model;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 
 /**

diff --git a/base/src/test/java/tk/mybatis/mapper/model/UserInfoAble.java b/base/src/test/java/tk/mybatis/mapper/model/UserInfoAble.java
@@ -24,7 +24,7 @@
 
 package tk.mybatis.mapper.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 
 /**

diff --git a/base/src/test/java/tk/mybatis/mapper/model/UserInfoMap.java b/base/src/test/java/tk/mybatis/mapper/model/UserInfoMap.java
@@ -24,9 +24,9 @@
 
 package tk.mybatis.mapper.model;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 import java.util.HashMap;
 

diff --git a/base/src/test/java/tk/mybatis/mapper/model/UserLogin.java b/base/src/test/java/tk/mybatis/mapper/model/UserLogin.java
@@ -24,9 +24,9 @@
 
 package tk.mybatis.mapper.model;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import java.util.Date;
 
 /**