From 8f633a5270d6fce41f4c5d1a04f99a513a437b98 Mon Sep 17 00:00:00 2001 From: huayanYu Date: Tue, 2 Jan 2024 22:50:52 +0800 Subject: [PATCH] release 4.3.0 --- dynamic-datasource-creator/pom.xml | 2 +- dynamic-datasource-spring-boot-common/pom.xml | 7 ++++- .../DruidDynamicDataSourceConfiguration.java | 0 .../pom.xml | 7 +---- .../pom.xml | 9 ++---- .../DruidDynamicDataSourceConfiguration.java | 30 ------------------- dynamic-datasource-spring/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 12 insertions(+), 47 deletions(-) rename {dynamic-datasource-spring-boot-starter => dynamic-datasource-spring-boot-common}/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DruidDynamicDataSourceConfiguration.java (100%) delete mode 100644 dynamic-datasource-spring-boot3-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DruidDynamicDataSourceConfiguration.java diff --git a/dynamic-datasource-creator/pom.xml b/dynamic-datasource-creator/pom.xml index d73d91b8..0bbc7dac 100644 --- a/dynamic-datasource-creator/pom.xml +++ b/dynamic-datasource-creator/pom.xml @@ -6,7 +6,7 @@ com.baomidou dynamic-datasource - 4.2.0 + 4.3.0 dynamic-datasource-creator diff --git a/dynamic-datasource-spring-boot-common/pom.xml b/dynamic-datasource-spring-boot-common/pom.xml index f4515354..97330ae2 100644 --- a/dynamic-datasource-spring-boot-common/pom.xml +++ b/dynamic-datasource-spring-boot-common/pom.xml @@ -6,7 +6,7 @@ com.baomidou dynamic-datasource - 4.2.0 + 4.3.0 dynamic-datasource-spring-boot-common @@ -56,6 +56,11 @@ org.springframework.boot spring-boot-starter-aop + + com.alibaba + druid-spring-boot-starter + true + org.springframework.boot spring-boot-configuration-processor diff --git a/dynamic-datasource-spring-boot-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DruidDynamicDataSourceConfiguration.java b/dynamic-datasource-spring-boot-common/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DruidDynamicDataSourceConfiguration.java similarity index 100% rename from dynamic-datasource-spring-boot-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DruidDynamicDataSourceConfiguration.java rename to dynamic-datasource-spring-boot-common/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DruidDynamicDataSourceConfiguration.java diff --git a/dynamic-datasource-spring-boot-starter/pom.xml b/dynamic-datasource-spring-boot-starter/pom.xml index d0bb0c21..cbbb5fbd 100644 --- a/dynamic-datasource-spring-boot-starter/pom.xml +++ b/dynamic-datasource-spring-boot-starter/pom.xml @@ -6,7 +6,7 @@ com.baomidou dynamic-datasource - 4.2.0 + 4.3.0 dynamic-datasource-spring-boot-starter @@ -24,11 +24,6 @@ spring-boot-starter-web true - - com.alibaba - druid-spring-boot-starter - true - org.springframework.boot spring-boot-configuration-processor diff --git a/dynamic-datasource-spring-boot3-starter/pom.xml b/dynamic-datasource-spring-boot3-starter/pom.xml index 98981aa0..d00f7947 100644 --- a/dynamic-datasource-spring-boot3-starter/pom.xml +++ b/dynamic-datasource-spring-boot3-starter/pom.xml @@ -6,7 +6,7 @@ com.baomidou dynamic-datasource - 4.2.0 + 4.3.0 dynamic-datasource-spring-boot3-starter @@ -16,7 +16,7 @@ 17 - 3.1.5 + 3.2.1 @@ -29,11 +29,6 @@ spring-boot-starter-web true - - com.alibaba - druid-spring-boot-3-starter - true - org.springframework.boot spring-boot-configuration-processor diff --git a/dynamic-datasource-spring-boot3-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DruidDynamicDataSourceConfiguration.java b/dynamic-datasource-spring-boot3-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DruidDynamicDataSourceConfiguration.java deleted file mode 100644 index 5dbbf7f7..00000000 --- a/dynamic-datasource-spring-boot3-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DruidDynamicDataSourceConfiguration.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baomidou.dynamic.datasource.spring.boot.autoconfigure; - -import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; -import com.alibaba.druid.spring.boot3.autoconfigure.properties.DruidStatProperties; -import com.alibaba.druid.spring.boot3.autoconfigure.stat.DruidFilterConfiguration; -import com.alibaba.druid.spring.boot3.autoconfigure.stat.DruidSpringAopConfiguration; -import com.alibaba.druid.spring.boot3.autoconfigure.stat.DruidStatViewServletConfiguration; -import com.alibaba.druid.spring.boot3.autoconfigure.stat.DruidWebStatFilterConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -/** - * 从原生DruidDataSourceAutoConfigure复制 - * - * @author TaoYu - * @since 1.1.0 - */ -@Configuration -@ConditionalOnClass(DruidDataSourceAutoConfigure.class) -@EnableConfigurationProperties({DruidStatProperties.class}) -@Import({ - DruidSpringAopConfiguration.class, - DruidStatViewServletConfiguration.class, - DruidWebStatFilterConfiguration.class, - DruidFilterConfiguration.class}) -public class DruidDynamicDataSourceConfiguration { - -} \ No newline at end of file diff --git a/dynamic-datasource-spring/pom.xml b/dynamic-datasource-spring/pom.xml index 0a5e5938..12575f05 100644 --- a/dynamic-datasource-spring/pom.xml +++ b/dynamic-datasource-spring/pom.xml @@ -6,7 +6,7 @@ com.baomidou dynamic-datasource - 4.2.0 + 4.3.0 dynamic-datasource-spring https://github.com/baomidou/dynamic-datasource-spring-boot-starter/tree/master/dynamic-datasource-spring diff --git a/pom.xml b/pom.xml index 586e047b..a449a047 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.baomidou dynamic-datasource - 4.2.0 + 4.3.0 pom ${project.artifactId} dynamic datasource