Change actuator dependency

Signed-off-by: “JermaineHua” <[email protected]>
CrazyHZM · Oct 30, 2024 · 5d8d078 · 5d8d078
1 parent d5d6075
commit 5d8d078
Show file tree

Hide file tree

Showing 22 changed files with 27 additions and 29 deletions.
diff --git a/dubbo-spring-boot-project/dubbo-spring-boot-actuator-autoconfigure/pom.xml b/dubbo-spring-boot-project/dubbo-spring-boot-actuator-autoconfigure/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>dubbo-spring-boot-actuator-autoconfigure</artifactId>
-  <description>Apache Dubbo Spring Boot Compatible for Spring Boot 1.x Actuator</description>
+  <description>Apache Dubbo Spring Boot Actuator Autoconfigure</description>
 
   <dependencies>
 
@@ -42,17 +42,24 @@
     </dependency>
 
     <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
-      <optional>true</optional>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-spring-boot-actuator</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-autoconfigure</artifactId>
+      <artifactId>spring-boot-actuator-autoconfigure</artifactId>
       <optional>true</optional>
     </dependency>
 
+    <!-- Dubbo autoconfigure -->
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-spring-boot-autoconfigure</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
     <!-- @ConfigurationProperties annotation processing (metadata for IDEs) -->
     <dependency>
       <groupId>org.springframework.boot</groupId>

diff --git a/...oEndpointAnnotationAutoConfiguration.java → ...oEndpointAnnotationAutoConfiguration.java b/...oEndpointAnnotationAutoConfiguration.java → ...oEndpointAnnotationAutoConfiguration.java
diff --git a/...ache/dubbo/spring/boot/actuate/autoconfigure/DubboExtensionEndpointAutoConfiguration.java b/...ache/dubbo/spring/boot/actuate/autoconfigure/DubboExtensionEndpointAutoConfiguration.java
@@ -16,7 +16,7 @@
  */
 package org.apache.dubbo.spring.boot.actuate.autoconfigure;
 
-import org.apache.dubbo.spring.boot.actuate.endpoint.configuration.DubboActuatorProperties;
+import org.apache.dubbo.spring.boot.actuate.endpoint.DubboActuatorProperties;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

diff --git a/...figure/DubboMetricsAutoConfiguration.java → ...figure/DubboMetricsAutoConfiguration.java b/...figure/DubboMetricsAutoConfiguration.java → ...figure/DubboMetricsAutoConfiguration.java
diff --git a/...ect/dubbo-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories b/...ect/dubbo-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -1,3 +1,5 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboHealthIndicatorAutoConfiguration,\
-org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointMetadataAutoConfiguration
+org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointMetadataAutoConfiguration,\
+org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfiguration,\
+org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboMetricsAutoConfiguration
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +1,5 @@
 org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboHealthIndicatorAutoConfiguration
 org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointMetadataAutoConfiguration
 org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboExtensionEndpointAutoConfiguration
+org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointAnnotationAutoConfiguration
+org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboMetricsAutoConfiguration
diff --git a/...pointAnnotationAutoConfigurationTest.java → ...pointAnnotationAutoConfigurationTest.java b/...pointAnnotationAutoConfigurationTest.java → ...pointAnnotationAutoConfigurationTest.java
diff --git a/dubbo-spring-boot-project/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-project/dubbo-spring-boot-actuator/pom.xml
@@ -30,12 +30,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-spring-boot-actuator-autoconfigure</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
     <!-- Spring Boot -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -49,16 +43,9 @@
       <optional>true</optional>
     </dependency>
 
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-autoconfigure</artifactId>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- Dubbo autoconfigure -->
     <dependency>
       <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-spring-boot-autoconfigure</artifactId>
+      <artifactId>dubbo-spring-boot</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/...onfiguration/DubboActuatorProperties.java → ...ate/endpoint/DubboActuatorProperties.java b/...onfiguration/DubboActuatorProperties.java → ...ate/endpoint/DubboActuatorProperties.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.spring.boot.actuate.endpoint.configuration;
+package org.apache.dubbo.spring.boot.actuate.endpoint;
 
 import java.util.Map;
 

diff --git a/...tuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboQosEndpoints.java b/...tuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboQosEndpoints.java
@@ -18,7 +18,6 @@
 
 import org.apache.dubbo.qos.command.ActuatorExecutor;
 import org.apache.dubbo.rpc.model.ApplicationModel;
-import org.apache.dubbo.spring.boot.actuate.endpoint.configuration.DubboActuatorProperties;
 import org.apache.dubbo.spring.boot.actuate.endpoint.metadata.DubboMetadata;
 
 import java.util.Map;

diff --git a/...point/metadata/AbstractDubboMetadata.java → ...point/metadata/AbstractDubboMetadata.java b/...point/metadata/AbstractDubboMetadata.java → ...point/metadata/AbstractDubboMetadata.java
diff --git a/...dpoint/metadata/DubboConfigsMetadata.java → ...dpoint/metadata/DubboConfigsMetadata.java b/...dpoint/metadata/DubboConfigsMetadata.java → ...dpoint/metadata/DubboConfigsMetadata.java
diff --git a/...uate/endpoint/metadata/DubboMetadata.java → ...uate/endpoint/metadata/DubboMetadata.java b/...uate/endpoint/metadata/DubboMetadata.java → ...uate/endpoint/metadata/DubboMetadata.java
diff --git a/...int/metadata/DubboPropertiesMetadata.java → ...int/metadata/DubboPropertiesMetadata.java b/...int/metadata/DubboPropertiesMetadata.java → ...int/metadata/DubboPropertiesMetadata.java
diff --git a/...int/metadata/DubboReferencesMetadata.java → ...int/metadata/DubboReferencesMetadata.java b/...int/metadata/DubboReferencesMetadata.java → ...int/metadata/DubboReferencesMetadata.java
diff --git a/...point/metadata/DubboServicesMetadata.java → ...point/metadata/DubboServicesMetadata.java b/...point/metadata/DubboServicesMetadata.java → ...point/metadata/DubboServicesMetadata.java
diff --git a/...point/metadata/DubboShutdownMetadata.java → ...point/metadata/DubboShutdownMetadata.java b/...point/metadata/DubboShutdownMetadata.java → ...point/metadata/DubboShutdownMetadata.java
diff --git a/.../actuate/health/DubboHealthIndicator.java → .../actuate/health/DubboHealthIndicator.java b/.../actuate/health/DubboHealthIndicator.java → .../actuate/health/DubboHealthIndicator.java
diff --git a/...ealth/DubboHealthIndicatorProperties.java → ...ealth/DubboHealthIndicatorProperties.java b/...ealth/DubboHealthIndicatorProperties.java → ...ealth/DubboHealthIndicatorProperties.java
diff --git a/...ring-boot-project/dubbo-spring-boot-actuator/src/main/resources/META-INF/spring.factories b/...ring-boot-project/dubbo-spring-boot-actuator/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/.../dubbo-spring-boot-compatible/dubbo-spring-boot-actuator-autoconfigure-compatible/pom.xml b/.../dubbo-spring-boot-compatible/dubbo-spring-boot-actuator-autoconfigure-compatible/pom.xml
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>dubbo-spring-boot-actuator-autoconfigure-compatible</artifactId>
-  <description>Apache Dubbo Spring Boot Compatible for Spring Boot 1.x Actuator</description>
+  <description>Apache Dubbo Spring Boot Actuator Autoconfigure Compatible for Spring Boot 1.x Actuator</description>
 
   <dependencies>
 
@@ -47,6 +47,12 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-spring-boot-actuator</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>