Merge pull request #4608 from evolvedbinary/hotfix/build-timestamp

Build timestamp should be the timestamp of the build and not the last git commit

Author: reinhapa

exist-core/src/main/java/org/exist/jetty/JettyStart.java

@@ -193,6 +193,7 @@ public synchronized void run(final String[] args, final Observer observer) {
             logger.info("[eXist Version : {}]", SystemProperties.getInstance().getSystemProperty("product-version", "unknown"));
             logger.info("[eXist Build : {}]", SystemProperties.getInstance().getSystemProperty("product-build", "unknown"));
             logger.info("[Git commit : {}]", SystemProperties.getInstance().getSystemProperty("git-commit", "unknown"));
+            logger.info("[Git commit timestamp : {}]", SystemProperties.getInstance().getSystemProperty("git-commit-timestamp", "unknown"));
 
             logger.info("[Operating System : {} {} {}]", System.getProperty("os.name"), System.getProperty("os.version"), System.getProperty("os.arch"));
             logger.info("[log4j.configurationFile : {}]", System.getProperty("log4j.configurationFile"));

exist-core/src/main/resources-filtered/org/exist/system.properties

@@ -24,6 +24,7 @@ vendor=eXist-db Project
 vendor-url=http://exist-db.org
 product-name=eXist
 product-version=${project.version}
-product-build=${build-tstamp}
+product-build=${maven.build.timestamp}
 git-branch=${build-version}
 git-commit=${build-commit}
+git-commit-timestamp=${build-tstamp}

exist-docker/src/main/resources-filtered/Dockerfile

@@ -55,7 +55,7 @@ COPY logs /exist/logs
 
 # Build-time metadata as defined at http://label-schema.org
 # and used by autobuilder @hooks/build
-LABEL org.label-schema.build-date=${build-tstamp} \
+LABEL org.label-schema.build-date=${maven.build.timestamp} \
       org.label-schema.description="${project.description}" \
       org.label-schema.name="existdb" \
       org.label-schema.schema-version="1.0" \

exist-docker/src/main/resources-filtered/Dockerfile-DEBUG

@@ -35,7 +35,7 @@ COPY logs /exist/logs
 
 # Build-time metadata as defined at http://label-schema.org
 # and used by autobuilder @hooks/build
-LABEL org.label-schema.build-date=${build-tstamp} \
+LABEL org.label-schema.build-date=${maven.build.timestamp} \
       org.label-schema.description="${project.description} (DEBUG version)" \
       org.label-schema.name="existdb-debug" \
       org.label-schema.schema-version="1.0" \

exist-parent/pom.xml

@@ -643,8 +643,9 @@
                                 <Build-Tag>${build-tag}</Build-Tag>
                                 <Git-Commit>${build-commit}</Git-Commit>
                                 <Git-Commit-Abbrev>${build-commit-abbrev}</Git-Commit-Abbrev>
+                                <Git-Commit-Timestamp>${build-tstamp}</Git-Commit-Timestamp>
                                 <Build-Version>${build-version}</Build-Version>
-                                <Build-Timestamp>${build-tstamp}</Build-Timestamp>
+                                <Build-Timestamp>${maven.build.timestamp}</Build-Timestamp>
                                 <Source-Repository>${project.scm.connection}</Source-Repository>
                                 <Description>${project.description}</Description>
                                 <Implementation-URL>${project.url}</Implementation-URL>
@@ -666,8 +667,9 @@
                                 <Build-Tag>${build-tag}</Build-Tag>
                                 <Git-Commit>${build-commit}</Git-Commit>
                                 <Git-Commit-Abbrev>${build-commit-abbrev}</Git-Commit-Abbrev>
+                                <Git-Commit-Timestamp>${build-tstamp}</Git-Commit-Timestamp>
                                 <Build-Version>${build-version}</Build-Version>
-                                <Build-Timestamp>${build-tstamp}</Build-Timestamp>
+                                <Build-Timestamp>${maven.build.timestamp}</Build-Timestamp>
                                 <Source-Repository>${project.scm.connection}</Source-Repository>
                                 <Description>${project.description}</Description>
                                 <Implementation-URL>${project.url}</Implementation-URL>
@@ -690,8 +692,9 @@
                                 <Build-Tag>${build-tag}</Build-Tag>
                                 <Git-Commit>${build-commit}</Git-Commit>
                                 <Git-Commit-Abbrev>${build-commit-abbrev}</Git-Commit-Abbrev>
+                                <Git-Commit-Timestamp>${build-tstamp}</Git-Commit-Timestamp>
                                 <Build-Version>${build-version}</Build-Version>
-                                <Build-Timestamp>${build-tstamp}</Build-Timestamp>
+                                <Build-Timestamp>${maven.build.timestamp}</Build-Timestamp>
                                 <Source-Repository>${project.scm.connection}</Source-Repository>
                                 <Description>${project.description}</Description>
                                 <Implementation-URL>${project.url}</Implementation-URL>
@@ -819,8 +822,9 @@
                                 <Build-Tag>${build-tag}</Build-Tag>
                                 <Git-Commit>${build-commit}</Git-Commit>
                                 <Git-Commit-Abbrev>${build-commit-abbrev}</Git-Commit-Abbrev>
+                                <Git-Commit-Timestamp>${build-tstamp}</Git-Commit-Timestamp>
                                 <Build-Version>${build-version}</Build-Version>
-                                <Build-Timestamp>${build-tstamp}</Build-Timestamp>
+                                <Build-Timestamp>${maven.build.timestamp}</Build-Timestamp>
                                 <Source-Repository>${project.scm.connection}</Source-Repository>
                                 <Description>${project.description}</Description>
                                 <Implementation-URL>${project.url}</Implementation-URL>