Merge 0ad73c260b into 915edd2982

1.2.28 init
1.2.27 release
2025-07-21 06:01:54 +00:00 · 2025-07-21 14:01:41 +08:00 · 2025-07-21 13:51:51 +08:00 · 2024-07-09 13:39:46 +00:00
7 changed files with 19 additions and 11 deletions
--- a/core/pom.xml
+++ b/core/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>druid-parent</artifactId>
-		<version>1.2.27-SNAPSHOT</version>
+		<version>1.2.28-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>druid</artifactId>
@ -276,7 +276,7 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.4.199</version>
+			<version>2.2.220</version>
 			<scope>provided</scope>
 		</dependency>

--- a/core/src/main/java/com/alibaba/druid/VERSION.java
+++ b/core/src/main/java/com/alibaba/druid/VERSION.java
@ -18,7 +18,7 @@ package com.alibaba.druid;
 public final class VERSION {
    public static final int MajorVersion = 1;
    public static final int MinorVersion = 2;
-    public static final int RevisionVersion = 27;
+    public static final int RevisionVersion = 28;

    public static String getVersionNumber() {
        return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion;
--- a/druid-demo-petclinic/pom.xml
+++ b/druid-demo-petclinic/pom.xml
@ -34,7 +34,7 @@
    <dependency>
      <groupId>com.alibaba</groupId>
      <artifactId>druid-spring-boot-starter</artifactId>
-      <version>1.2.27-SNAPSHOT</version>
+      <version>1.2.28-SNAPSHOT</version>
    </dependency>
    <!-- Spring and Spring Boot dependencies -->
    <dependency>
--- a/druid-spring-boot-3-starter/pom.xml
+++ b/druid-spring-boot-3-starter/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.alibaba</groupId>
        <artifactId>druid-parent</artifactId>
-        <version>1.2.27-SNAPSHOT</version>
+        <version>1.2.28-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>druid-spring-boot-3-starter</artifactId>
@ -53,44 +53,52 @@
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
+            <version>2.0.17</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-autoconfigure</artifactId>
+            <version>${springboot3.version}</version>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-jdbc</artifactId>
+            <version>6.1.21</version>
            <optional>true</optional>
        </dependency>
        <!-- @ConfigurationProperties annotation processing (metadata for IDEs) -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-configuration-processor</artifactId>
+            <version>${springboot3.version}</version>
            <optional>true</optional>
        </dependency>

        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${springboot3.version}</version>
            <scope>test</scope>
        </dependency>

        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${springboot3.version}</version>
            <scope>test</scope>
        </dependency>

        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <version>${springboot3.version}</version>
            <scope>test</scope>
        </dependency>

        <dependency>
            <groupId>com.h2database</groupId>
            <artifactId>h2</artifactId>
+            <version>2.3.232</version>
            <scope>test</scope>
        </dependency>
    </dependencies>
@ -119,8 +127,8 @@
            <plugin>
                <artifactId>maven-compiler-plugin</artifactId>
                <configuration>
-                    <source>9</source>
-                    <target>9</target>
+                    <source>17</source>
+                    <target>17</target>
                    <annotationProcessorPaths>
                        <path>
                            <groupId>org.springframework.boot</groupId>
--- a/druid-spring-boot-starter/pom.xml
+++ b/druid-spring-boot-starter/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.alibaba</groupId>
        <artifactId>druid-parent</artifactId>
-        <version>1.2.27-SNAPSHOT</version>
+        <version>1.2.28-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>druid-spring-boot-starter</artifactId>
--- a/druid-wrapper/pom.xml
+++ b/druid-wrapper/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>druid-parent</artifactId>
-		<version>1.2.27-SNAPSHOT</version>
+		<version>1.2.28-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba</groupId>
--- a/pom.xml
+++ b/pom.xml
@ -6,7 +6,7 @@

 	<groupId>com.alibaba</groupId>
 	<artifactId>druid-parent</artifactId>
-	<version>1.2.27-SNAPSHOT</version>
+	<version>1.2.28-SNAPSHOT</version>
 	<name>${project.artifactId}</name>
 	<description>A JDBC datasource implementation.</description>
 	<packaging>pom</packaging>
@ -206,7 +206,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.4.1</version>
+					<version>3.8.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
Author	SHA1	Message	Date
dependabot[bot]	0a11741316	Merge `0ad73c260b` into `915edd2982`	2025-07-21 06:01:54 +00:00
wenshao	915edd2982	1.2.28 init Java CI / Test JDK ${{ matrix.java }}, ${{ matrix.os }} (11, ubuntu-latest) (push) Has been cancelled Details Java CI / Test JDK ${{ matrix.java }}, ${{ matrix.os }} (17, ubuntu-latest) (push) Has been cancelled Details Java CI / Test JDK ${{ matrix.java }}, ${{ matrix.os }} (21, ubuntu-latest) (push) Has been cancelled Details Java CI / Test JDK ${{ matrix.java }}, ${{ matrix.os }} (8, ubuntu-latest) (push) Has been cancelled Details	2025-07-21 14:01:41 +08:00
wenshao	e51daaa38b	1.2.27 release	2025-07-21 13:51:51 +08:00
dependabot[bot]	0ad73c260b	Bump com.h2database:h2 from 1.4.199 to 2.2.220 in /core Bumps [com.h2database:h2](https://github.com/h2database/h2database) from 1.4.199 to 2.2.220. - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](https://github.com/h2database/h2database/compare/version-1.4.199...version-2.2.220) --- updated-dependencies: - dependency-name: com.h2database:h2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-09 13:39:46 +00:00