Skip to content

Commit 3623401

Browse files
CrazyHZMCrazyHZM
committed
Change actuator dependency
Signed-off-by: “JermaineHua” <crazyhzm@gmail.com>
1 parent d5d6075 commit 3623401

12 files changed

Lines changed: 14 additions & 33 deletions

File tree

‎dubbo-spring-boot-project/dubbo-spring-boot-actuator-autoconfigure/pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</parent>
2626

2727
<artifactId>dubbo-spring-boot-actuator-autoconfigure</artifactId>
28-
<description>Apache Dubbo Spring Boot Compatible for Spring Boot 1.x Actuator</description>
28+
<description>Apache Dubbo Spring Boot Actuator Autoconfigure</description>
2929

3030
<dependencies>
3131

@@ -42,15 +42,16 @@
4242
</dependency>
4343

4444
<dependency>
45-
<groupId>org.springframework.boot</groupId>
46-
<artifactId>spring-boot-starter-actuator</artifactId>
47-
<optional>true</optional>
45+
<groupId>org.apache.dubbo</groupId>
46+
<artifactId>dubbo-spring-boot-actuator</artifactId>
47+
<version>${project.version}</version>
4848
</dependency>
4949

50+
<!-- Dubbo autoconfigure -->
5051
<dependency>
51-
<groupId>org.springframework.boot</groupId>
52-
<artifactId>spring-boot-autoconfigure</artifactId>
53-
<optional>true</optional>
52+
<groupId>org.apache.dubbo</groupId>
53+
<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
54+
<version>${project.version}</version>
5455
</dependency>
5556

5657
<!-- @ConfigurationProperties annotation processing (metadata for IDEs) -->

dubbo-spring-boot-project/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfiguration.java renamed to dubbo-spring-boot-project/dubbo-spring-boot-actuator-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfiguration.java

File renamed without changes.

dubbo-spring-boot-project/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboMetricsAutoConfiguration.java renamed to dubbo-spring-boot-project/dubbo-spring-boot-actuator-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboMetricsAutoConfiguration.java

File renamed without changes.

‎dubbo-spring-boot-project/dubbo-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
22
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboHealthIndicatorAutoConfiguration,\
3-
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointMetadataAutoConfiguration
3+
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointMetadataAutoConfiguration,\
4+
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfiguration,\
5+
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboMetricsAutoConfiguration

‎dubbo-spring-boot-project/dubbo-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboHealthIndicatorAutoConfiguration
22
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointMetadataAutoConfiguration
33
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboExtensionEndpointAutoConfiguration
4+
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfiguration
5+
org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboMetricsAutoConfiguration

dubbo-spring-boot-project/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java renamed to dubbo-spring-boot-project/dubbo-spring-boot-actuator-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java

File renamed without changes.

‎dubbo-spring-boot-project/dubbo-spring-boot-actuator/pom.xml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@
3030

3131
<dependencies>
3232

33-
<dependency>
34-
<groupId>org.apache.dubbo</groupId>
35-
<artifactId>dubbo-spring-boot-actuator-autoconfigure</artifactId>
36-
<version>${project.version}</version>
37-
</dependency>
38-
3933
<!-- Spring Boot -->
4034
<dependency>
4135
<groupId>org.springframework.boot</groupId>
@@ -49,19 +43,6 @@
4943
<optional>true</optional>
5044
</dependency>
5145

52-
<dependency>
53-
<groupId>org.springframework.boot</groupId>
54-
<artifactId>spring-boot-autoconfigure</artifactId>
55-
<optional>true</optional>
56-
</dependency>
57-
58-
<!-- Dubbo autoconfigure -->
59-
<dependency>
60-
<groupId>org.apache.dubbo</groupId>
61-
<artifactId>dubbo-spring-boot-autoconfigure</artifactId>
62-
<version>${project.version}</version>
63-
</dependency>
64-
6546
<!-- Dubbo -->
6647
<dependency>
6748
<groupId>org.apache.dubbo</groupId>

dubbo-spring-boot-project/dubbo-spring-boot-actuator-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/actuate/health/DubboHealthIndicator.java renamed to dubbo-spring-boot-project/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/health/DubboHealthIndicator.java

File renamed without changes.

dubbo-spring-boot-project/dubbo-spring-boot-actuator-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/actuate/health/DubboHealthIndicatorProperties.java renamed to dubbo-spring-boot-project/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/health/DubboHealthIndicatorProperties.java

File renamed without changes.

‎dubbo-spring-boot-project/dubbo-spring-boot-actuator/src/main/resources/META-INF/spring.factories‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)