alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/open699' into open-master

Browse Source
This commit is contained in:
bwyu
2015-02-02 15:44:13 -08:00
parent 7be872c3a4 8fee134f5c
commit 60e450c0cb
2 changed files with 67 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
platform/core/bundle.json
View File

@@ -6,14 +6,26 @@
"versions": [ "versions": [
{ {
"name": "Open MCT Web", "name": "Open MCT Web",
"value": "0.3.0-dev", "value": "${project.version}",
"priority": 1000 "priority": 999
}, },
{ {
"name": "Built", "name": "Built",
"value": "YYYY-MM-DDTHH:MM:ssZ", "value": "${timestamp}",
"description": "The date on which this version of the client was built.", "description": "The date on which this version of the client was built.",
"priority": 990 "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": [ "components": [

65
pom.xml
View File

@@ -13,32 +13,71 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<!-- SCM info, for build number plugin -->
<scm>
<connection>scm:git:${basedir}</connection>
</scm>
<build> <build>
<plugins> <plugins>
<!-- Assemble WAR file -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.4</version> <version>2.4</version>
<configuration> <configuration>
<warSourceDirectory>.</warSourceDirectory> <webResources>
<warSourceIncludes> <resource>
index.html, <directory>.</directory>
*.json, <includes>
**/src/**/*, <include>index.html</include>
**/res/**/*, <include>*.json</include>
**/lib/**/*, <include>**/src/**/*</include>
**/bundle.json <include>**/res/**/*</include>
</warSourceIncludes> <include>**/lib/**/*</include>
<warSourceExcludes> <include>**/bundle.json</include>
example/**/*, </includes>
**/test/lib/* <excludes>
</warSourceExcludes> <exclude>platform/core/bundle.json</exclude>
<exclude>example/**/*</exclude>
<exclude>**/test/lib/*</exclude>
</excludes>
</resource>
<resource>
<directory>.</directory>
<includes>
<include>platform/core/bundle.json</include>
</includes>
<filtering>true</filtering>
</resource>
</webResources>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
</configuration> </configuration>
</plugin> </plugin>
<!-- Get commit hash, timestamp -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.3</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<timestampFormat>{0,date,yyyy-MM-dd HH:mm:ss.SSSZ}</timestampFormat>
<doCheck>true</doCheck>
<doUpdate>false</doUpdate>
<revisionOnScmFailure>Unknown</revisionOnScmFailure>
</configuration>
</plugin>
<!-- Get PhantomJS plugin --> <!-- Get PhantomJS plugin -->
<plugin> <plugin>
<groupId>com.github.klieber</groupId> <groupId>com.github.klieber</groupId>