diff --git a/platform/core/bundle.json b/platform/core/bundle.json index 3ae730083c..8ec1f1f96e 100644 --- a/platform/core/bundle.json +++ b/platform/core/bundle.json @@ -6,14 +6,26 @@ "versions": [ { "name": "Open MCT Web", - "value": "0.3.0-dev", - "priority": 1000 + "value": "${project.version}", + "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 + }, + { + "name": "Branch", + "value": "${scmBranch}", + "description": "The date on which this version of the client was built.", + "priority": 994 } ], "components": [ diff --git a/pom.xml b/pom.xml index 74cac18a90..f12870da97 100644 --- a/pom.xml +++ b/pom.xml @@ -13,32 +13,71 @@ UTF-8 + + + scm:git:${basedir} + + + org.apache.maven.plugins maven-war-plugin 2.4 - . - - index.html, - *.json, - **/src/**/*, - **/res/**/*, - **/lib/**/*, - **/bundle.json - - - example/**/*, - **/test/lib/* - + + + . + + index.html + *.json + **/src/**/* + **/res/**/* + **/lib/**/* + **/bundle.json + + + platform/core/bundle.json + example/**/* + **/test/lib/* + + + + . + + platform/core/bundle.json + + true + + false + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.3 + + + validate + + create + + + + + {0,date,yyyy-MM-dd HH:mm:ss.SSSZ} + true + false + Unknown + + + com.github.klieber