commit 99746ab2caa77f53389819866235a6da2b4daaf0
author Ken Lee <kle@bsiag.com> Tue Mar 04 19:30:32 2014 +0100
committer Ken Lee <kle@bsiag.com> Tue Mar 04 13:31:45 2014 -0500
tree 8819e184100e62b75455a672bad52eb5db6fef69
parent a5de1221cba8071aac4167d8f17c4ddfffdcdf44

Bug 429542 - CBI Build: Create Release Builds

https://bugs.eclipse.org/bugs/show_bug.cgi?id=429542

Change-Id: I4324b0bb046ce611abf375d7cc5c948e9d97e8fb
Reviewed-on: https://git.eclipse.org/r/22879
Reviewed-by: Ken Lee <kle@bsiag.com>
IP-Clean: Ken Lee <kle@bsiag.com>
Tested-by: Ken Lee <kle@bsiag.com>

org.eclipse.scout.parent/pom.xml

diff --git a/org.eclipse.scout.parent/pom.xml b/org.eclipse.scout.parent/pom.xml
index 314bf18..3c095c3 100755
--- a/org.eclipse.scout.parent/pom.xml
+++ b/org.eclipse.scout.parent/pom.xml
@@ -68,6 +68,8 @@
     <buildId>${buildType}${maven.build.timestamp}</buildId>
     <buildsToKeep>3</buildsToKeep>
 
+    <scout.version>${scout.build.version}</scout.version>
+
     <comparator.repo>http://download.eclipse.org/eclipse/updates/4.3-M-builds</comparator.repo>
     <tycho.version>0.19.0</tycho.version>
     <tycho-extras.version>0.19.0</tycho-extras.version>

pom.xml

diff --git a/pom.xml b/pom.xml
index 3d8d9d0..b349dc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <properties>
     <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/scout/org.eclipse.scout-aggregator.git</tycho.scmUrl>
     <scout.base.version>4.0.0</scout.base.version>
-    <scout.version>${scout.base.version}-SNAPSHOT</scout.version>
+    <scout.build.version>${scout.base.version}-SNAPSHOT</scout.build.version>
   </properties>
 
   <distributionManagement>
@@ -80,7 +80,7 @@
       <id>prepare-release</id>
       <properties>
         <milestone.version>I</milestone.version>
-        <scout.build.version>${scout.base.version}.${maven.build.timestamp}-${milestone.version}</scout.build.version>
+        <scout.newVersion>${scout.base.version}.${maven.build.timestamp}-${milestone.version}</scout.newVersion>
       </properties>
       <activation>
         <activeByDefault>false</activeByDefault>
@@ -98,8 +98,8 @@
                   <goal>set-version</goal>
                 </goals>
                 <configuration>
-                  <newVersion>${scout.build.version}</newVersion>
-                  <properties>scout.version</properties>
+                  <newVersion>${scout.newVersion}</newVersion>
+                  <properties>scout.build.version</properties>
                 </configuration>
                 <phase>validate</phase>
               </execution>