Set dependency for Spring Cloud to 5.0.0-M1 (#1465)

Author: maciejwalkowiak

pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
+		<version>5.0.0-M1</version>
 		<relativePath/><!-- lookup parent from repository -->
 	</parent>
 

spring-cloud-aws-autoconfigure/pom.xml

@@ -31,7 +31,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-micrometer-metrics</artifactId>
+			<artifactId>spring-boot-metrics</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/metrics/CloudWatchExportAutoConfiguration.java

@@ -32,9 +32,9 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.micrometer.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
-import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration;
-import org.springframework.boot.micrometer.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration;
+import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
+import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
+import org.springframework.boot.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import software.amazon.awssdk.regions.providers.AwsRegionProvider;
 import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient;

spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/metrics/CloudWatchPropertiesConfigAdapter.java

@@ -16,7 +16,7 @@
 package io.awspring.cloud.autoconfigure.metrics;
 
 import io.micrometer.cloudwatch2.CloudWatchConfig;
-import org.springframework.boot.micrometer.metrics.autoconfigure.export.properties.StepRegistryPropertiesConfigAdapter;
+import org.springframework.boot.metrics.autoconfigure.export.properties.StepRegistryPropertiesConfigAdapter;
 
 /**
  * Adapter to convert {@link CloudWatchRegistryProperties} to a {@link CloudWatchConfig}.

spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/metrics/CloudWatchRegistryProperties.java

@@ -16,7 +16,7 @@
 package io.awspring.cloud.autoconfigure.metrics;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.micrometer.metrics.autoconfigure.export.properties.StepRegistryProperties;
+import org.springframework.boot.metrics.autoconfigure.export.properties.StepRegistryProperties;
 
 /**
  * {@link ConfigurationProperties} for configuring CloudWatch metrics export.

spring-cloud-aws-dependencies/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
+		<version>5.0.0-M1</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -28,10 +28,10 @@
 		<amazon.dax.version>2.0.5</amazon.dax.version>
 		<amazon.encryption.s3.version>3.3.5</amazon.encryption.s3.version>
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-		<spring-cloud-commons.version>5.0.0-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-commons.version>5.0.0-M1</spring-cloud-commons.version>
 		<jakarta.mail.version>2.1.3</jakarta.mail.version>
 		<eclipse.jakarta.mail.version>2.0.3</eclipse.jakarta.mail.version>
-		<spring-modulith.version>2.0.0-SNAPSHOT</spring-modulith.version>
+		<spring-modulith.version>2.0.0-M2</spring-modulith.version>
 		<amazon.s3.accessgrants>2.3.0</amazon.s3.accessgrants>
 	</properties>