#3682 - Maven pom.xml should use the same version as all other build scripts

svn changeset:11568/svn branch:6.3

diff --git a/build/build.xml b/build/build.xml
index cd624dc9011e9596b1636ff75c90db923994c9ba..c5b337f64a1d5be8bf84d1bcd88888487701c086 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -130,6 +130,10 @@
     <target name="init" depends="check-java-version">
         <property file="build/build.properties" />
         <property file="build/VERSION.properties" />
+       <antcontrib:propertyregex property="version.major" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\1"/>
+       <antcontrib:propertyregex property="version.minor" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\2"/>
+       <antcontrib:propertyregex property="version.revision" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\3"/>
+
         <property file="build/GWT-VERSION.properties" />
         <property file="build/html-style.properties" />
 
@@ -1070,7 +1074,22 @@
     </target>
 
     
-    <target name="nightly-maven-publish" depends="">
+    <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}" />
+                </replacetokens>
+            </filterchain>
+            <fileset file="build/maven/pom-template.xml"/>
+        </copy>
+    </target>
+       
+    <target name="nightly-maven-publish" depends="nightly-maven-pom.xml">
         <property file="${gpg.passphrase.file}" />
         <echo>Publishing ${output-dir}/WebContent/${lib-jar-name} to Maven repository</echo>
         <artifact:mvn>

diff --git a/build/maven/pom-template.xml b/build/maven/pom-template.xml
new file mode 100644 (file)
index 0000000..5c2cb1a
--- /dev/null
+++ b/build/maven/pom-template.xml
@@ -0,0 +1,63 @@
+<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/maven-v4_0_0.xsd">\r
+  <modelVersion>4.0.0</modelVersion>\r
+  <groupId>com.vaadin</groupId>\r
+  <artifactId>vaadin</artifactId>\r
+  <version>@VERSION-MAJOR.MINOR@-SNAPSHOT</version>\r
+  <name>Vaadin</name>\r
+  <organization>\r
+    <name>Oy IT Mill Ltd</name>\r
+    <url>http://vaadin.com</url>\r
+  </organization>\r
+  <url>http://vaadin.com</url>\r
+  <description>\r
+      Vaadin is a web application framework for Rich Internet Applications (RIA).\r
+\r
+      Vaadin enables easy development and maintenance of fast and secure rich web\r
+      applications with a stunning look and feel and a wide browser support.\r
+      It features a server-side architecture with the majority of the logic running\r
+      on the server. Ajax technology is used at the browser-side to ensure a rich\r
+      and interactive user experience.\r
+  </description>\r
+  <licenses>\r
+    <license>\r
+      <name>Apache License Version 2.0</name>\r
+      <distribution>repo</distribution>\r
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>\r
+    </license>\r
+  </licenses>\r
+  <distributionManagement>\r
+    <repository>\r
+      <id>vaadin-releases</id>\r
+      <name>Vaadin release repository</name>\r
+      <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url>\r
+    </repository>\r
+    <snapshotRepository>\r
+      <id>vaadin-snapshots</id>\r
+      <name>Vaadin snapshot repository</name>\r
+      <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>\r
+    </snapshotRepository>\r
+  </distributionManagement>\r
+  <repositories>\r
+    <repository>\r
+      <id>vaadin-snapshots</id>\r
+      <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>\r
+      <releases>\r
+        <enabled>false</enabled>\r
+      </releases>\r
+      <snapshots>\r
+        <enabled>true</enabled>\r
+      </snapshots>\r
+    </repository>\r
+    <repository>\r
+      <id>vaadin-releases</id>\r
+      <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url>\r
+      <releases>\r
+        <enabled>true</enabled>\r
+      </releases>\r
+      <snapshots>\r
+        <enabled>false</enabled>\r
+      </snapshots>\r
+    </repository>\r
+  </repositories>\r
+  \r
+</project>
\ No newline at end of file

diff --git a/build/maven/pom.xml b/build/maven/pom.xml
deleted file mode 100644 (file)
index b03913b..0000000
--- a/build/maven/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<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/maven-v4_0_0.xsd">\r
-  <modelVersion>4.0.0</modelVersion>\r
-  <groupId>com.vaadin</groupId>\r
-  <artifactId>vaadin</artifactId>\r
-  <version>6.3-SNAPSHOT</version>\r
-  <name>Vaadin</name>\r
-  <organization>\r
-    <name>Oy IT Mill Ltd</name>\r
-    <url>http://vaadin.com</url>\r
-  </organization>\r
-  <url>http://vaadin.com</url>\r
-  <description>\r
-      Vaadin is a web application framework for Rich Internet Applications (RIA).\r
-\r
-      Vaadin enables easy development and maintenance of fast and secure rich web\r
-      applications with a stunning look and feel and a wide browser support.\r
-      It features a server-side architecture with the majority of the logic running\r
-      on the server. Ajax technology is used at the browser-side to ensure a rich\r
-      and interactive user experience.\r
-  </description>\r
-  <licenses>\r
-    <license>\r
-      <name>Apache License Version 2.0</name>\r
-      <distribution>repo</distribution>\r
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>\r
-    </license>\r
-  </licenses>\r
-  <distributionManagement>\r
-    <repository>\r
-      <id>vaadin-releases</id>\r
-      <name>Vaadin release repository</name>\r
-      <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url>\r
-    </repository>\r
-    <snapshotRepository>\r
-      <id>vaadin-snapshots</id>\r
-      <name>Vaadin snapshot repository</name>\r
-      <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>\r
-    </snapshotRepository>\r
-  </distributionManagement>\r
-  <repositories>\r
-    <repository>\r
-      <id>vaadin-snapshots</id>\r
-      <url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>\r
-      <releases>\r
-        <enabled>false</enabled>\r
-      </releases>\r
-      <snapshots>\r
-        <enabled>true</enabled>\r
-      </snapshots>\r
-    </repository>\r
-    <repository>\r
-      <id>vaadin-releases</id>\r
-      <url>http://oss.sonatype.org/content/repositories/vaadin-releases/</url>\r
-      <releases>\r
-        <enabled>true</enabled>\r
-      </releases>\r
-      <snapshots>\r
-        <enabled>false</enabled>\r
-      </snapshots>\r
-    </repository>\r
-  </repositories>\r
-  \r
-</project>
\ No newline at end of file