Remove spring-cloud-aws-actuator module.

Fixes spring-atticgh-571 Closes spring-atticgh-604
maciejwalkowiak · Jun 19, 2020 · 524c132 · 524c132
1 parent 1f53dc9
commit 524c132
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 62 deletions.
diff --git a/docs/src/main/asciidoc/spring-cloud-aws.adoc b/docs/src/main/asciidoc/spring-cloud-aws.adoc
@@ -2327,13 +2327,13 @@ public class SimpleResourceLoadingBean {
 ----
 == CloudWatch Metrics
 Spring Cloud AWS provides Spring Boot auto-configuration for Micrometer CloudWatch integration.
-To send metrics to CloudWatch add a dependency to `spring-cloud-aws-actuator` module:
+To send metrics to CloudWatch add a dependency to `micrometer-registry-cloudwatch` module:
 
 [source,xml,indent=0]
 ----
 <dependency>
-	<groupId>org.springframework.cloud</groupId>
-	<artifactId>spring-cloud-aws-actuator</artifactId>
+	<groupId>io.micrometer</groupId>
+	<artifactId>micrometer-registry-cloudwatch</artifactId>
 </dependency>
 ----
 

diff --git a/pom.xml b/pom.xml
@@ -58,7 +58,6 @@
 		<module>spring-cloud-aws-jdbc</module>
 		<module>spring-cloud-aws-messaging</module>
 		<module>spring-cloud-aws-autoconfigure</module>
-		<module>spring-cloud-aws-actuator</module>
 		<module>spring-cloud-aws-parameter-store-config</module>
 		<module>spring-cloud-aws-secrets-manager-config</module>
 		<module>spring-cloud-starter-aws</module>

diff --git a/spring-cloud-aws-actuator/pom.xml b/spring-cloud-aws-actuator/pom.xml
diff --git a/spring-cloud-aws-autoconfigure/pom.xml b/spring-cloud-aws-autoconfigure/pom.xml
@@ -53,8 +53,13 @@
 			<artifactId>spring-boot-autoconfigure</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-aws-actuator</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-actuator-autoconfigure</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-cloudwatch</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

diff --git a/spring-cloud-aws-dependencies/pom.xml b/spring-cloud-aws-dependencies/pom.xml
@@ -129,11 +129,6 @@
 				<artifactId>spring-cloud-aws-autoconfigure</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-aws-actuator</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-aws-parameter-store-config</artifactId>