Merge branch '2.7.x' into 3.0.x

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilterTests.java

@@ -175,33 +175,33 @@ class PropertiesMeterFilterTests {
 	@Test
 	void configureWhenHasPercentilesShouldSetPercentilesToValue() {
 		PropertiesMeterFilter filter = new PropertiesMeterFilter(
-				createProperties("distribution.percentiles.spring.boot=1,1.5,2"));
+				createProperties("distribution.percentiles.spring.boot=0.2,0.4,0.8"));
 		assertThat(filter.configure(createMeterId("spring.boot"), DistributionStatisticConfig.DEFAULT).getPercentiles())
-			.containsExactly(1, 1.5, 2);
+			.containsExactly(0.2, 0.4, 0.8);
 	}
 
 	@Test
 	void configureWhenHasHigherPercentilesShouldSetPercentilesToValue() {
 		PropertiesMeterFilter filter = new PropertiesMeterFilter(
-				createProperties("distribution.percentiles.spring=1,1.5,2"));
+				createProperties("distribution.percentiles.spring=0.2,0.4,0.8"));
 		assertThat(filter.configure(createMeterId("spring.boot"), DistributionStatisticConfig.DEFAULT).getPercentiles())
-			.containsExactly(1, 1.5, 2);
+			.containsExactly(0.2, 0.4, 0.8);
 	}
 
 	@Test
 	void configureWhenHasHigherPercentilesAndLowerShouldSetPercentilesToLower() {
 		PropertiesMeterFilter filter = new PropertiesMeterFilter(createProperties(
-				"distribution.percentiles.spring=1,1.5,2", "distribution.percentiles.spring.boot=3,3.5,4"));
+				"distribution.percentiles.spring=0.2,0.4,0.8", "distribution.percentiles.spring.boot=0.85,0.9,0.95"));
 		assertThat(filter.configure(createMeterId("spring.boot"), DistributionStatisticConfig.DEFAULT).getPercentiles())
-			.containsExactly(3, 3.5, 4);
+			.containsExactly(0.85, 0.9, 0.95);
 	}
 
 	@Test
 	void configureWhenAllPercentilesSetShouldSetPercentilesToValue() {
 		PropertiesMeterFilter filter = new PropertiesMeterFilter(
-				createProperties("distribution.percentiles.all=1,1.5,2"));
+				createProperties("distribution.percentiles.all=0.2,0.4,0.8"));
 		assertThat(filter.configure(createMeterId("spring.boot"), DistributionStatisticConfig.DEFAULT).getPercentiles())
-			.containsExactly(1, 1.5, 2);
+			.containsExactly(0.2, 0.4, 0.8);
 	}
 
 	@Test