发布 1.4.7

pagehelper · Jun 3, 2023 · ebdc5b7 · ebdc5b7
1 parent 329eca7
commit ebdc5b7
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # Maven #
 target/
+.flattened-pom.xml
 
 # IDEA #
 .idea/

diff --git a/README.md b/README.md
@@ -16,10 +16,17 @@ Add the following dependency to your pom.xml:
 <dependency>
   <groupId>com.github.pagehelper</groupId>
   <artifactId>pagehelper-spring-boot-starter</artifactId>
-  <version>1.4.6</version>
+  <version>1.4.7</version>
 </dependency>
 ```
 
+## v1.4.7 - 2023-06-03
+
+- 升级 PageHelper 到 5.3.3
+- 升级 MyBatis 到 3.5.13
+- 升级 MyBatis Starter 到 2.3.1
+- 升级 springboot 到 2.7.12
+
 ## v1.4.6 - 2022-11-28
 
 - 兼容 Spring Boot 3.0 by [pky920216344](https://github.com/pky920216344)

diff --git a/pagehelper-spring-boot-autoconfigure/pom.xml b/pagehelper-spring-boot-autoconfigure/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot</artifactId>
-        <version>1.4.6</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>pagehelper-spring-boot-autoconfigure</artifactId>
     <name>pagehelper-spring-boot-autoconfigure</name>

diff --git a/pagehelper-spring-boot-samples/pagehelper-spring-boot-sample-annotation/pom.xml b/pagehelper-spring-boot-samples/pagehelper-spring-boot-sample-annotation/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot-samples</artifactId>
-        <version>1.4.6</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>pagehelper-spring-boot-sample-annotation</artifactId>
     <packaging>jar</packaging>

diff --git a/pagehelper-spring-boot-samples/pagehelper-spring-boot-sample-xml/pom.xml b/pagehelper-spring-boot-samples/pagehelper-spring-boot-sample-xml/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot-samples</artifactId>
-        <version>1.4.6</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>pagehelper-spring-boot-sample-xml</artifactId>
     <packaging>jar</packaging>

diff --git a/pagehelper-spring-boot-samples/pom.xml b/pagehelper-spring-boot-samples/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot</artifactId>
-        <version>1.4.6</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>pagehelper-spring-boot-samples</artifactId>
     <packaging>pom</packaging>

diff --git a/pagehelper-spring-boot-starter/pom.xml b/pagehelper-spring-boot-starter/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot</artifactId>
-        <version>1.4.6</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>pagehelper-spring-boot-starter</artifactId>
     <name>pagehelper-spring-boot-starter</name>

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>com.github.pagehelper</groupId>
     <artifactId>pagehelper-spring-boot</artifactId>
-    <version>1.4.6</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
 
     <name>pagehelper-spring-boot</name>
@@ -63,15 +63,17 @@
     </modules>
 
     <properties>
+        <revision>1.4.7</revision>
+
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <mybatis.version>3.5.10</mybatis.version>
-        <pagehelper.version>5.3.2</pagehelper.version>
-        <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
-        <spring-boot.version>2.7.3</spring-boot.version>
+        <mybatis.version>3.5.13</mybatis.version>
+        <pagehelper.version>5.3.3</pagehelper.version>
+        <mybatis-spring-boot.version>2.3.1</mybatis-spring-boot.version>
+        <spring-boot.version>2.7.12</spring-boot.version>
     </properties>
 
     <dependencyManagement>
@@ -202,6 +204,31 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.1.0</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>