diff options
| author | Artur Signell <artur.signell@itmill.com> | 2010-03-01 16:21:01 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2010-03-01 16:21:01 +0000 |
| commit | b0c1eaf9dcc4597282e1e2016c1e61fa1c14e36c (patch) | |
| tree | 450472173e60373aae31403dcfaa854759203c0a /build | |
| parent | 6b3d7c1d61c43bf03c2cc99053eb393457e71df4 (diff) | |
| download | vaadin-framework-b0c1eaf9dcc4597282e1e2016c1e61fa1c14e36c.tar.gz vaadin-framework-b0c1eaf9dcc4597282e1e2016c1e61fa1c14e36c.zip | |
#3682 - Maven pom.xml should use the same version as all other build scripts
svn changeset:11568/svn branch:6.3
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 21 | ||||
| -rw-r--r-- | build/maven/pom-template.xml (renamed from build/maven/pom.xml) | 2 |
2 files changed, 21 insertions, 2 deletions
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.xml b/build/maven/pom-template.xml index b03913baf8..5c2cb1a727 100644 --- a/build/maven/pom.xml +++ b/build/maven/pom-template.xml @@ -2,7 +2,7 @@ <modelVersion>4.0.0</modelVersion>
<groupId>com.vaadin</groupId>
<artifactId>vaadin</artifactId>
- <version>6.3-SNAPSHOT</version>
+ <version>@VERSION-MAJOR.MINOR@-SNAPSHOT</version>
<name>Vaadin</name>
<organization>
<name>Oy IT Mill Ltd</name>
|