Merge branch '3.3.x'

Closes gh-42936
spring-projects · Oct 30, 2024 · a52bdc9 · a52bdc9
2 parents 9a3605f + 35d6d76
commit a52bdc9
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 3 deletions.
diff --git a/...ven-plugin/src/intTest/java/org/springframework/boot/maven/BuildInfoIntegrationTests.java b/...ven-plugin/src/intTest/java/org/springframework/boot/maven/BuildInfoIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.time.Instant;
 import java.util.Properties;
 import java.util.function.Consumer;
 
@@ -83,6 +84,16 @@ void generatedBuildInfoReproducible(MavenBuild mavenBuild) {
 				.hasBuildTime("2021-04-21T11:22:33Z")));
 	}
 
+	@TestTemplate
+	void generatedBuildInfoReproducibleEpochSeconds(MavenBuild mavenBuild) {
+		mavenBuild.project("build-info-reproducible-epoch-seconds")
+			.execute(buildInfo((buildInfo) -> assertThat(buildInfo).hasBuildGroup("org.springframework.boot.maven.it")
+				.hasBuildArtifact("build-reproducible-epoch-seconds")
+				.hasBuildName("Generate build info with build time from project.build.outputTimestamp")
+				.hasBuildVersion("0.0.1.BUILD-SNAPSHOT")
+				.hasBuildTime(Instant.ofEpochSecond(1619004153).toString())));
+	}
+
 	@TestTemplate
 	void buildInfoPropertiesAreGeneratedToCustomOutputLocation(MavenBuild mavenBuild) {
 		mavenBuild.project("build-info-custom-file")

diff --git a/...ring-boot-maven-plugin/src/intTest/projects/build-info-reproducible-epoch-seconds/pom.xml b/...ring-boot-maven-plugin/src/intTest/projects/build-info-reproducible-epoch-seconds/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework.boot.maven.it</groupId>
+	<artifactId>build-reproducible-epoch-seconds</artifactId>
+	<version>0.0.1.BUILD-SNAPSHOT</version>
+	<name>Generate build info with build time from project.build.outputTimestamp</name>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>@java.version@</maven.compiler.source>
+		<maven.compiler.target>@java.version@</maven.compiler.target>
+		<project.build.outputTimestamp>1619004153</project.build.outputTimestamp>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>@project.groupId@</groupId>
+				<artifactId>@project.artifactId@</artifactId>
+				<version>@project.version@</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>build-info</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/...jects/build-info-reproducible-epoch-seconds/src/main/java/org/test/SampleApplication.java b/...jects/build-info-reproducible-epoch-seconds/src/main/java/org/test/SampleApplication.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2012-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.test;
+
+public class SampleApplication {
+
+	public static void main(String[] args) {
+	}
+
+}
diff --git a/.../spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildInfoMojo.java b/.../spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/BuildInfoMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -154,7 +154,7 @@ private Instant getBuildTime() {
 		if ("off".equalsIgnoreCase(this.time)) {
 			return null;
 		}
-		return Instant.parse(this.time);
+		return new MavenBuildOutputTimestamp(this.time).toInstant();
 	}
 
 }