Index: plugins/com.jboss.jbds.product/about.mappings
===================================================================
--- plugins/com.jboss.jbds.product/about.mappings	(revision 11729)
+++ plugins/com.jboss.jbds.product/about.mappings	(working copy)
@@ -2,6 +2,7 @@
 # contains fill-ins for about.properties
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # This file does not need to be translated.
+# This file is generated. See pom.xml.
 
 0=@product.releaseNumber@
 1=@product.buildQualifier@
Index: plugins/com.jboss.jbds.product/pom.xml
===================================================================
--- plugins/com.jboss.jbds.product/pom.xml	(revision 11729)
+++ plugins/com.jboss.jbds.product/pom.xml	(working copy)
@@ -1,98 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>com.jboss.jbds.product</groupId>
-		<artifactId>plugins</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
-	</parent>
-	<groupId>com.jboss.jbds.product.plugins</groupId>
-	<artifactId>com.jboss.jbds.product</artifactId>
-	<version>7.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-	<properties>
-		<ant.regexp.regexpimpl>org.apache.tools.ant.util.regexp.JakartaOroRegexp</ant.regexp.regexpimpl>
-	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<dependencies>
-					<dependency>
-						<groupId>ant-contrib</groupId>
-						<artifactId>ant-contrib</artifactId>
-						<version>1.0b3</version>
-						<exclusions>
-							<exclusion>
-								<groupId>ant</groupId>
-								<artifactId>ant</artifactId>
-							</exclusion>
-						</exclusions>
-					</dependency>
-					<dependency>
-						<groupId>org.apache.ant</groupId>
-						<artifactId>ant-apache-oro</artifactId>
-						<version>1.7.1</version>
-					</dependency>
-				</dependencies>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>${maven.antrun.plugin.version}</version>
-				<executions>
-					<execution>
-						<id>process-about-mapping</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<!-- can test this script by passing in different values, eg., 
-									mvn clean verify -DBundle-Version=6.0.0.Alpha2-v20120906-1845-B303
-								-->
-								<taskdef resource="net/sf/antcontrib/antlib.xml" />
-								<property file="${project.build.directory}/MANIFEST.MF" />
-								<echo level="debug">Bundle-Version = ${Bundle-Version}</echo>
-								<echo level="debug">project.build.finalName = ${project.build.finalName}</echo>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.jboss.jbds.product</groupId>
+    <artifactId>plugins</artifactId>
+    <version>7.0.0-SNAPSHOT</version>
+  </parent>
+  <groupId>com.jboss.jbds.product.plugins</groupId>
+  <artifactId>com.jboss.jbds.product</artifactId>
+  <version>7.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+  <properties>
+    <ant.regexp.regexpimpl>org.apache.tools.ant.util.regexp.JakartaOroRegexp</ant.regexp.regexpimpl>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <dependencies>
+          <dependency>
+            <groupId>ant-contrib</groupId>
+            <artifactId>ant-contrib</artifactId>
+            <version>1.0b3</version>
+            <exclusions>
+              <exclusion>
+                <groupId>ant</groupId>
+                <artifactId>ant</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant-apache-oro</artifactId>
+            <version>1.7.1</version>
+          </dependency>
+        </dependencies>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>${maven.antrun.plugin.version}</version>
+        <executions>
+          <execution>
+            <id>process-about-mapping</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <!-- back up a copy of the latest about.mappings because we're about to replace it -->
+                <copy file="${basedir}/about.mappings" tofile="${basedir}/about.mappings_UNMERGED" overwrite="true"/>
 
-								<!-- JBDS-2251 reorder the qualifiers; reorder the regex matches too -->
-								<propertyregex override="true" property="product.releaseNumber"
-									input="${Bundle-Version}" regexp="([0-9]\.[0-9]\.[0-9])\.([^-]+)-(.+)$"
-									select="\1.\2" />
-								<echo level="info">product.releaseNumber = ${product.releaseNumber}</echo>
+                <!-- [echo] buildQualifier = Beta2-v20130528-2036, project.version = 7.0.0-SNAPSHOT, BUILD_ALIAS=Beta2 -->
+                <echo level="debug">buildQualifier = ${buildQualifier}, project.version = ${project.version}, BUILD_ALIAS=${BUILD_ALIAS}</echo>
 
-								<propertyregex override="true" property="product.buildQualifier"
-									input="${Bundle-Version}" regexp="([0-9]\.[0-9]\.[0-9])\.(.+)"
-									select="\2" />
-								<echo level="info">product.buildQualifier = ${product.buildQualifier}</echo>
+                <taskdef resource="net/sf/antcontrib/antlib.xml" />
+                <propertyregex override="true" property="product.releaseNumber" input="${project.version}.${BUILD_ALIAS}" regexp="-SNAPSHOT" replace="" />
+                <echo level="info">product.releaseNumber = ${product.releaseNumber}</echo>
 
-								<!-- JBDS-2251 reorder the qualifiers; reorder the regex matches too -->
-								<propertyregex override="true" property="product.buildTimeStamp"
-									input="${product.buildQualifier}" regexp=".+-v([0-9]+-[0-9]+).*"
-									select="\1" />
-								<echo level="info">product.buildTimeStamp = ${product.buildTimeStamp}</echo>
+                <echo level="info">buildQualifier = ${buildQualifier}</echo>
 
-								<copy todir="${project.build.directory}" filtering="true">
-									<fileset dir="${basedir}">
-										<include name="about.mappings" />
-									</fileset>
-									<filterset>
-										<filter token="product.releaseNumber" value="${product.releaseNumber}" />
-										<filter token="product.buildQualifier" value="${product.buildQualifier}" />
-										<filter token="product.buildTimeStamp" value="${product.buildTimeStamp}" />
-									</filterset>
-								</copy>
-								<zip update="yes"
-									destfile="${project.build.directory}/${project.build.finalName}.jar">
-									<zipfileset dir="${project.build.directory}">
-										<include name="about.mappings" />
-									</zipfileset>
-								</zip>
+                <propertyregex override="true" property="product.buildTimeStamp" input="${buildQualifier}" regexp=".+-v([0-9]+-[0-9]+).*" select="\1" />
+                <echo level="info">product.buildTimeStamp = ${product.buildTimeStamp}</echo>
 
-							</tasks>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+                <copy file="${basedir}/about.mappings" tofile="${basedir}/about.mappings_MERGED" filtering="true">
+                  <filterset>
+                    <filter token="product.releaseNumber" value="${product.releaseNumber}" />
+                    <filter token="product.buildQualifier" value="${buildQualifier}" />
+                    <filter token="product.buildTimeStamp" value="${product.buildTimeStamp}" />
+                  </filterset>
+                </copy>
+                <move file="${basedir}/about.mappings_MERGED" tofile="${basedir}/about.mappings" overwrite="true"/>
+              </tasks>
+            </configuration>
+          </execution>
+          <execution>
+            <id>revert-about-mapping</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <move file="${basedir}/about.mappings_UNMERGED" tofile="${basedir}/about.mappings" overwrite="true"/>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
Index: pom.xml
===================================================================
--- pom.xml	(revision 11744)
+++ pom.xml	(working copy)
@@ -85,7 +85,7 @@
 
 To replicate a Jenkins CI build, run like this (unified.target and hudson profile require VPN access):
 
-  mvn clean install -P hudson,eap,pack200 -Dtpc.targetKind=unified -DTARGET_PLATFORM_VERSION=4.30.5.Alpha4-SNAPSHOT -DTARGET_PLATFORM_VERSION_MAXIMUM=4.30.5.Alpha4-SNAPSHOT -DBUILD_NUMBER=1234 -DJOB_NAME=devstudio.product_trunk -Dupdate.site.description="Development Milestone"
+  mvn clean install -P hudson,eap,pack200 -Dtpc.targetKind=unified -DTARGET_PLATFORM_VERSION=4.30.5.Alpha5 -DTARGET_PLATFORM_VERSION_MAXIMUM=4.30.5.Alpha5 -DBUILD_NUMBER=1234 -DJOB_NAME=devstudio.product_trunk -Dupdate.site.description="Development Milestone"
 
 See README.md for information building, installing, contributing, generated artifacts, and more.