Merge branch '3.1.x' into 3.2.x

mhalbritter · mhalbritter · commit b416db4dee0f · 2024-04-24T14:04:08.000+02:00
Closes gh-40498
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/MavenBuildOutputTimestamp.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/MavenBuildOutputTimestamp.java
@@ -91,8 +91,8 @@ Instant toInstant() {
 				.truncatedTo(ChronoUnit.SECONDS)
 				.toInstant();
 			if (instant.isBefore(DATE_MIN) || instant.isAfter(DATE_MAX)) {
-				throw new IllegalArgumentException(String
-					.format(String.format("'%s' is not within the valid range %s to %s", instant, DATE_MIN, DATE_MAX)));
+				throw new IllegalArgumentException(
+						String.format("'%s' is not within the valid range %s to %s", instant, DATE_MIN, DATE_MAX));
 			}
 			return instant;
 		}

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@ Instant toInstant() {`
`91`	`91`	`.truncatedTo(ChronoUnit.SECONDS)`
`92`	`92`	`.toInstant();`
`93`	`93`	`if (instant.isBefore(DATE_MIN) \|\| instant.isAfter(DATE_MAX)) {`
`94`		`- throw new IllegalArgumentException(String`
`95`		`- .format(String.format("'%s' is not within the valid range %s to %s", instant, DATE_MIN, DATE_MAX)));`
	`94`	`+ throw new IllegalArgumentException(`
	`95`	`+ String.format("'%s' is not within the valid range %s to %s", instant, DATE_MIN, DATE_MAX));`
`96`	`96`	`}`
`97`	`97`	`return instant;`
`98`	`98`	`}`