[jbosstools-commits] JBoss Tools SVN: r43373 - in trunk/build/aggregate: webtools-site and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: nickboldt
Date: 2012-09-01 16:28:41 -0400 (Sat, 01 Sep 2012)
New Revision: 43373

Modified:
   trunk/build/aggregate/build.xml
   trunk/build/aggregate/webtools-site/pom.xml
Log:
JBDS-2251

Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml	2012-09-01 18:06:29 UTC (rev 43372)
+++ trunk/build/aggregate/build.xml	2012-09-01 20:28:41 UTC (rev 43373)
@@ -504,7 +504,7 @@
 		<!-- 
 		Properties calculated here
 			from ${JOB_NAME} = jbosstools-3.2.0.M1.aggregate get 3.2.0.M1  
-			from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER}
+			from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-B${BUILD_NUMBER}
 			default update.site.description=Nightly Build
 			default update.site.version=(null)
 		-->
@@ -528,10 +528,10 @@
 						<isset property="BUILD_ALIAS" />
 					</and>
 					<then>
-						<propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9x.]+)(_.*?)\.(.*?)\.*aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\4" />
+						<propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9x.]+)(_.*?)\.(.*?)\.*aggregate" replace=": ${JBT_VERSION}.${BUILD_ALIAS}-${BUILD_TS}-B${BUILD_NUMBER}.\4" />
 					</then>
 					<else>
-						<propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9x.]+)(.*).aggregate" replace=": \2.${BUILD_TS}-H${BUILD_NUMBER}\3" />
+						<propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9x.]+)(.*).aggregate" replace=": \2.${BUILD_TS}-B${BUILD_NUMBER}.\3" />
 					</else>
 				</if>
 			</then>

Modified: trunk/build/aggregate/webtools-site/pom.xml
===================================================================
--- trunk/build/aggregate/webtools-site/pom.xml	2012-09-01 18:06:29 UTC (rev 43372)
+++ trunk/build/aggregate/webtools-site/pom.xml	2012-09-01 20:28:41 UTC (rev 43373)
@@ -11,6 +11,12 @@
 	<artifactId>org.jboss.tools.site.webtools</artifactId>
 	<name>JBoss Tools - Web Tools Site</name>
 	<packaging>eclipse-update-site</packaging>
+	<!-- to test output, use:
+		mvn install \
+		-DJOB_NAME=jbosstools-4.0_trunk.webtools.aggregate \
+		-DBUILD_ID=2012-12-12_01-02-03 -DBUILD_NUMBER=69 -DJBT_VERSION=4.0.99 \
+		-DBUILD_ALIAS=Alpha7 -Dupdate.site.description="Stable Milestone"
+	-->
 	<build>
 		<plugins>
 			<plugin>