diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml index 0be7f90f3da..57d8814f69c 100644 --- a/dubbo-distribution/dubbo-bom/pom.xml +++ b/dubbo-distribution/dubbo-bom/pom.xml @@ -526,6 +526,11 @@ dubbo-spring-boot-starter ${project.version} + + org.apache.dubbo + dubbo-spring-boot-3-starter + ${project.version} + org.apache.dubbo dubbo-spring-boot-interceptor diff --git a/dubbo-spring-boot/dubbo-spring-boot-3-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-3-starter/pom.xml new file mode 100644 index 00000000000..a74b8bd4fbe --- /dev/null +++ b/dubbo-spring-boot/dubbo-spring-boot-3-starter/pom.xml @@ -0,0 +1,68 @@ + + + + 4.0.0 + + org.apache.dubbo + dubbo-spring-boot + ${revision} + ../pom.xml + + + dubbo-spring-boot-3-starter + jar + Apache Dubbo Spring Boot 3 Starter + + + 3.2.1 + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter + true + + + + org.apache.dubbo + dubbo-spring-boot-autoconfigure + ${project.version} + + + + org.apache.dubbo + dubbo-spring-boot-3-autoconfigure + ${project.version} + + + + diff --git a/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml index b21cb786f88..b5f89587144 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml @@ -41,11 +41,5 @@ dubbo-spring-boot-autoconfigure ${project.version} - - org.apache.dubbo - dubbo-spring-boot-3-autoconfigure - ${project.version} - - diff --git a/dubbo-spring-boot/pom.xml b/dubbo-spring-boot/pom.xml index 96fb40c0570..37982ec747b 100644 --- a/dubbo-spring-boot/pom.xml +++ b/dubbo-spring-boot/pom.xml @@ -32,7 +32,6 @@ dubbo-spring-boot-actuator dubbo-spring-boot-autoconfigure - dubbo-spring-boot-3-autoconfigure dubbo-spring-boot-compatible dubbo-spring-boot-starter dubbo-spring-boot-starters @@ -190,5 +189,24 @@ 2.2.8.RELEASE + + + spring-boot-3 + + [17,) + + + dubbo-spring-boot-3-autoconfigure + dubbo-spring-boot-3-starter + + + + + release + + dubbo-spring-boot-3-autoconfigure + dubbo-spring-boot-3-starter + + diff --git a/dubbo-test/dubbo-dependencies-all/pom.xml b/dubbo-test/dubbo-dependencies-all/pom.xml index b0b79badb7e..9e054aa82ab 100644 --- a/dubbo-test/dubbo-dependencies-all/pom.xml +++ b/dubbo-test/dubbo-dependencies-all/pom.xml @@ -387,11 +387,6 @@ dubbo-spring-boot-autoconfigure ${project.version} - - org.apache.dubbo - dubbo-spring-boot-3-autoconfigure - ${project.version} - org.apache.dubbo dubbo-spring-boot-actuator-compatible diff --git a/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java b/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java index 80c94eb1297..6cf83dda534 100644 --- a/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java +++ b/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java @@ -54,6 +54,8 @@ class FileTest { ignoredModules.add(Pattern.compile("dubbo-demo.*")); ignoredModules.add(Pattern.compile("dubbo-annotation-processor")); ignoredModules.add(Pattern.compile("dubbo-config-spring6")); + ignoredModules.add(Pattern.compile("dubbo-spring-boot-3-autoconfigure")); + ignoredModules.add(Pattern.compile("dubbo-spring-boot-3-starter")); ignoredModules.add(Pattern.compile("dubbo-plugin-loom.*")); ignoredArtifacts.add(Pattern.compile("dubbo-demo.*")); @@ -69,6 +71,8 @@ class FileTest { ignoredModulesInDubboAll.add(Pattern.compile("dubbo-metadata-processor")); ignoredModulesInDubboAll.add(Pattern.compile("dubbo-native.*")); ignoredModulesInDubboAll.add(Pattern.compile("dubbo-config-spring6.*")); + ignoredModulesInDubboAll.add(Pattern.compile("dubbo-spring-boot-3-autoconfigure.*")); + ignoredModulesInDubboAll.add(Pattern.compile("dubbo-spring-boot-3-starter.*")); ignoredModulesInDubboAll.add(Pattern.compile(".*spring-boot.*")); ignoredModulesInDubboAll.add(Pattern.compile("dubbo-maven-plugin")); }