From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 1 Mar 2010 16:21:01 +0000 (+0000)
Subject: #3682 - Maven pom.xml should use the same version as all other build scripts
X-Git-Tag: 6.7.0.beta1~2011
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b0c1eaf9dcc4597282e1e2016c1e61fa1c14e36c;p=vaadin-framework.git

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