From e4def8a3f5763443c170e641d4e8e89c26a4e06f Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Thu, 22 Jan 2015 17:12:52 -0800
Subject: [PATCH] [About] Use timestamp, build number

Use timestamp and build number (as filterable properties) in
the built core bundle. WTD-699.
---
 platform/core/bundle.json | 10 ++++++++--
 pom.xml                   | 14 +++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/platform/core/bundle.json b/platform/core/bundle.json
index ef1fd9ccd4..2dc4a738dd 100644
--- a/platform/core/bundle.json
+++ b/platform/core/bundle.json
@@ -7,13 +7,19 @@
             {
                 "name": "Open MCT Web",
                 "value": "${project.version}",
-                "priority": 1000
+                "priority": 999
             },
             {
                 "name": "Built",
-                "value": "YYYY-MM-DDTHH:MM:ssZ",
+                "value": "${timestamp}",
                 "description": "The date on which this version of the client was built.",
                 "priority": 990
+            },
+            {
+                "name": "Revision",
+                "value": "${buildNumber}",
+                "description": "A unique revision identifier for the client sources.",
+                "priority": 995
             }
         ],
         "components": [
diff --git a/pom.xml b/pom.xml
index e47928d875..f12870da97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <!-- SCM info, for build number plugin -->
+    <scm>
+        <connection>scm:git:${basedir}</connection>
+    </scm>
+
     <build>
 
         <plugins>
@@ -64,17 +69,12 @@
                             <goal>create</goal>
                         </goals>
                     </execution>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>create-timestamp</goal>
-                        </goals>
-                    </execution>
                 </executions>
                 <configuration>
-                    <timestampFormat>yyyy-MM-dd HH:mm:ss</timestampFormat>
+                    <timestampFormat>{0,date,yyyy-MM-dd HH:mm:ss.SSSZ}</timestampFormat>
                     <doCheck>true</doCheck>
                     <doUpdate>false</doUpdate>
+                    <revisionOnScmFailure>Unknown</revisionOnScmFailure>
                 </configuration>
             </plugin>