Complete support for project.build.outputTimestamp
This commit completes the support of project.build.outputTimestamp to also support a value that's expressed as seconds since the epoch. See gh-42922
This commit is contained in:
parent
c340c691c5
commit
491515e6e3
|
@ -83,6 +83,16 @@ class BuildInfoIntegrationTests {
|
|||
.hasBuildTime("2021-04-21T11:22:33Z")));
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
void generatedBuildInfoReproducibleEpochSeconds(MavenBuild mavenBuild) {
|
||||
mavenBuild.project("build-info-reproducible-epochseconds")
|
||||
.execute(buildInfo((buildInfo) -> assertThat(buildInfo).hasBuildGroup("org.springframework.boot.maven.it")
|
||||
.hasBuildArtifact("build-reproducible-epochseconds")
|
||||
.hasBuildName("Generate build info with build time from project.build.outputTimestamp")
|
||||
.hasBuildVersion("0.0.1.BUILD-SNAPSHOT")
|
||||
.hasBuildTime("1976-01-09T12:00:00Z")));
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
void buildInfoPropertiesAreGeneratedToCustomOutputLocation(MavenBuild mavenBuild) {
|
||||
mavenBuild.project("build-info-custom-file")
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
<?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-epochseconds</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>
|
||||
<!-- Epoch seconds should be support bey build-info plugin too -->
|
||||
<project.build.outputTimestamp>190036800</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>
|
|
@ -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) {
|
||||
}
|
||||
|
||||
}
|
|
@ -154,7 +154,7 @@ public class BuildInfoMojo extends AbstractMojo {
|
|||
if ("off".equalsIgnoreCase(this.time)) {
|
||||
return null;
|
||||
}
|
||||
return Instant.parse(this.time);
|
||||
return new MavenBuildOutputTimestamp(this.time).toInstant();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue