Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-06 01:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-9791 Use maven.build.timestamp during manifest generation instead of buildhelper timestamp

Browse Source 
This closes #5861

Signed-off-by: Mike Thomsen <mthomsen@apache.org>
This commit is contained in:
Bryan Bende 2022-03-12 10:13:08 -05:00 committed by Mike Thomsen
parent d424537c53
commit e226d3be52
No known key found for this signature in database
GPG Key ID: 88511C3D4CAD246F
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/RuntimeManifestGenerator.java
View File

@ -34,6 +34,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Properties;
/**
@ -47,6 +49,7 @@ public class RuntimeManifestGenerator {
private static final String PROJECT_VERSION_PROPERTY = "Project-Version";
private static final String BUILD_REVISION = "Build-Revision";
private static final String BUILD_TIMESTAMP = "Build-Timestamp";
private static final String BUILD_TIMESTAMP_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
private static final String BUILD_JDK = "Build-Jdk";
private static final String BUILD_JDK_VENDOR = "Build-Jdk-Vendor";
@ -75,10 +78,19 @@ public class RuntimeManifestGenerator {
final String buildJdk = buildProperties.getProperty(BUILD_JDK);
final String buildJdkVendor = buildProperties.getProperty(BUILD_JDK_VENDOR);
long buildTimestampMillis;
try {
final SimpleDateFormat buildTimestampFormat = new SimpleDateFormat(BUILD_TIMESTAMP_FORMAT);
final Date buildTimestampDate = buildTimestampFormat.parse(buildTimestamp);
buildTimestampMillis = buildTimestampDate.getTime();
} catch (Exception e) {
buildTimestampMillis = System.currentTimeMillis();
}
final BuildInfo buildInfo = new BuildInfo();
buildInfo.setVersion(runtimeVersion);
buildInfo.setRevision(buildRevision);
buildInfo.setTimestamp(Long.valueOf(buildTimestamp));
buildInfo.setTimestamp(buildTimestampMillis);
buildInfo.setCompiler(buildJdkVendor + " " + buildJdk);
final RuntimeManifest runtimeManifest = new StandardRuntimeManifestBuilder()

2
nifi-manifest/nifi-runtime-manifest/src/main/resources/build.properties
View File

@ -16,7 +16,7 @@
Project-Version:${project.version}
Build-Branch:${buildBranch}
Build-Revision:${buildRevision}
Build-Timestamp:${timestamp}
Build-Timestamp:${maven.build.timestamp}
Built-By:${user.name}
Maven-Home:${maven.home}
Maven-Version:${maven.version}