From 2776a22823fd3150ad520aff6997e02e011dd592 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Wed, 29 Jun 2011 10:35:26 +0000
Subject: [PATCH] Build script updates for custom build (Maven version number)

svn changeset:19562/svn branch:6.6
---
 build/build.xml              | 8 ++++----
 build/maven/pom-template.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index ffb8c19f3c..8715c8ff1f 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -114,6 +114,8 @@
     	<antcontrib:propertyregex property="version.minor" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\2"/>
     	<antcontrib:propertyregex property="version.revision" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\3"/>
 
+    	<property name="vaadin.version.maven" value="${version.major}.${version.minor}-SNAPSHOT" />
+
         <property file="build/GWT-VERSION.properties" />
         <property file="build/html-style.properties" />
 
@@ -1009,7 +1011,7 @@
 		            <format property="build.date.compact" pattern="yyyyMMdd"/>
 		        </tstamp>
 		        <property file="${build.properties.file}" />
-				<property name="version" value="${vaadin.internal.version}"/>
+				<property name="version" value="${vaadin.version}"/>
 		        <property name="version.full" value="${version}.custom-${build.date.compact}"/>
 	   		</then>
 			<!-- Otherwise version and snapshot.repository.url come from target "init" -->
@@ -1113,13 +1115,11 @@
     
     <target name="nightly-maven-pom.xml">
     	<echo>Creating pom.xml for nightly build</echo>
-    	<fail unless="version.major" message="Major version must be defined in version.major"/>
-    	<fail unless="version.minor" message="Major version must be defined in version.minor"/>
         <copy tofile="build/maven/pom.xml">
             <filterchain>
                 <expandproperties />
                 <replacetokens begintoken="@" endtoken="@">
-                    <token key="VERSION-MAJOR.MINOR" value="${version.major}.${version.minor}" />
+                    <token key="MAVEN-VERSION" value="${vaadin.version.maven}" />
                 </replacetokens>
             </filterchain>
             <fileset file="build/maven/pom-template.xml"/>
diff --git a/build/maven/pom-template.xml b/build/maven/pom-template.xml
index 5c2cb1a727..851642dd3c 100644
--- a/build/maven/pom-template.xml
+++ b/build/maven/pom-template.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.vaadin</groupId>
   <artifactId>vaadin</artifactId>
-  <version>@VERSION-MAJOR.MINOR@-SNAPSHOT</version>
+  <version>@MAVEN-VERSION@</version>
   <name>Vaadin</name>
   <organization>
     <name>Oy IT Mill Ltd</name>
-- 
2.39.5