This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch 3.3-dev-xds in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3-dev-xds by this push: new c4a7f94c52 add triple and servlet optional dependencies. c4a7f94c52 is described below commit c4a7f94c521fd0effa8df8ff30e02a370ffb73c8 Author: chickenlj <ken.lj...@gmail.com> AuthorDate: Mon Jul 8 16:00:03 2024 +0800 add triple and servlet optional dependencies. --- .../dubbo-spring-boot-3-autoconfigure/pom.xml | 14 ++++++++++++++ .../boot/autoconfigure/DubboTriple3AutoConfiguration.java | 3 ++- dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml | 7 +++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml index a31465cc62..ded8a11829 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml @@ -60,6 +60,20 @@ <optional>true</optional> </dependency> + <dependency> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-rpc-triple</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-triple-servlet</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> diff --git a/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboTriple3AutoConfiguration.java b/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboTriple3AutoConfiguration.java index 80fd90ef39..49c337b7dd 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboTriple3AutoConfiguration.java +++ b/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboTriple3AutoConfiguration.java @@ -26,7 +26,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type; import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation. + Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; diff --git a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml index af3d04948d..c4ab546730 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml @@ -64,6 +64,13 @@ <optional>true</optional> </dependency> + <dependency> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-triple-servlet</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.apache.dubbo</groupId> <artifactId>dubbo-config-spring</artifactId>