Scarab commit: svn commit: r11162 - branches/20120417_mavenPort: . src/conf/conf

Author: mcoss
Date: 2012-04-17 01:36:23-0700
New Revision: 11162

Modified:
   branches/20120417_mavenPort/pom.xml
   branches/20120417_mavenPort/src/conf/conf/TurbineResources.properties

Log:
ENH - Manage Scarab's build version by maven build.

Modified: branches/20120417_mavenPort/pom.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/20120417_mavenPort/pom.xml?view=diff&pathrev=11162&r1=11161&r2=11162
==============================================================================
--- branches/20120417_mavenPort/pom.xml	(original)
+++ branches/20120417_mavenPort/pom.xml	2012-04-17 01:36:23-0700
@@ -5,11 +5,11 @@
 			Head
 ###########################################################################################-->
 
-<modelVersion>4.0.0</modelVersion>
+<modelVersion>4.0.0</modelVersion>
 <groupId>org.tigris</groupId>
-<artifactId>scarab</artifactId>
-<packaging>war</packaging>
-<name>Scarab Tracker</name>
+<artifactId>scarab</artifactId>
+<packaging>war</packaging>
+<name>Scarab Tracker</name>
 <version>1.0b23-mavenPort-dev</version>
   
   <organization>
@@ -369,7 +369,7 @@
 	        </configuration>
 		</plugin>
 		  
-    </plugins>
+    </plugins>
  </build>
  
 <!--######################################################################################
@@ -708,7 +708,9 @@
 
   </dependencies>
   
-  <properties>
+  <properties>
   	<sonar.light>true</sonar.light>
-  </properties>
+  	<maven.build.timestamp.format>yyMMdd_HHmm</maven.build.timestamp.format>
+    <build.timestamp>${maven.build.timestamp}</build.timestamp>
+  </properties>
 </project>
\ No newline at end of file

Modified: branches/20120417_mavenPort/src/conf/conf/TurbineResources.properties
Url: http://scarab.tigris.org/source/browse/scarab/branches/20120417_mavenPort/src/conf/conf/TurbineResources.properties?view=diff&pathrev=11162&r1=11161&r2=11162
==============================================================================
--- branches/20120417_mavenPort/src/conf/conf/TurbineResources.properties	(original)
+++ branches/20120417_mavenPort/src/conf/conf/TurbineResources.properties	2012-04-17 01:36:23-0700
@@ -650,7 +650,7 @@
 #
 # -------------------------------------------------------------------
 #
-scarab.build.version=@VERSION@-@BUILD_DATE@
+scarab.build.version=${pom.version}-${build.timestamp}
 scarab.email.default.template=Default.vm
 scarab.email.reportissue.template=NewIssueNotification.vm
 scarab.email.modifyissue.template=ModifyIssue.vm

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2949029