[jbosstools-commits] JBoss Tools SVN: r41201 - trunk/build/aggregate.

[jbosstools-commits at lists.jboss.org]

Author: dpalmer
Date: 2012-05-21 06:50:32 -0400 (Mon, 21 May 2012)
New Revision: 41201

Modified:
   trunk/build/aggregate/build.xml
Log:
[JBIDE-11720] Adjusted regex to match the soatools job names as well as the devstudio names

Modified: trunk/build/aggregate/build.xml
===================================================================
--- trunk/build/aggregate/build.xml	2012-05-21 10:26:50 UTC (rev 41200)
+++ trunk/build/aggregate/build.xml	2012-05-21 10:50:32 UTC (rev 41201)
@@ -525,7 +525,7 @@
 						<isset property="BUILD_ALIAS" />
 					</and>
 					<then>
-						<propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(_.*?\.)(.*).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-9.]+)(_.*?)\.(.*?)\.*aggregate" replace=": ${JBT_VERSION}.${BUILD_TS}-H${BUILD_NUMBER}-${BUILD_ALIAS}\4" />
 					</then>
 					<else>
 						<propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="(jboss|soa)tools-([0-9.]+)(.*).aggregate" replace=": \2.${BUILD_TS}-H${BUILD_NUMBER}\3" />