[jbosstools-commits] JBoss Tools SVN: r41553 - branches/jbosstools-3.3.x/build/aggregate.

[jbosstools-commits at lists.jboss.org]

Author: nickboldt
Date: 2012-05-30 17:32:22 -0400 (Wed, 30 May 2012)
New Revision: 41553

Modified:
   branches/jbosstools-3.3.x/build/aggregate/build.xml
Log:
https://issues.jboss.org/browse/JBIDE-12058

Modified: branches/jbosstools-3.3.x/build/aggregate/build.xml
===================================================================
--- branches/jbosstools-3.3.x/build/aggregate/build.xml	2012-05-30 21:26:51 UTC (rev 41552)
+++ branches/jbosstools-3.3.x/build/aggregate/build.xml	2012-05-30 21:32:22 UTC (rev 41553)
@@ -525,10 +525,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-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-9x.]+)(_.*?)\.(.*?)\.*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" />
+						<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" />
 					</else>
 				</if>
 			</then>