cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Chip Childers <chipchild...@apache.org>
Subject Re: git commit: updated refs/heads/4.2 to 2b34dc5
Date Fri, 13 Dec 2013 15:45:20 GMT
On Fri, Dec 13, 2013 at 06:06:02AM +0000, aprateek@apache.org wrote:
> Updated Branches:
>   refs/heads/4.2 c494064c0 -> 2b34dc509
> 
> 
> fixed build_asf.sh so that the xapi version is not affected
> 
> 
> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b34dc50
> Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b34dc50
> Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b34dc50
> 
> Branch: refs/heads/4.2
> Commit: 2b34dc509aa7a2400ad7db8cae31feb656042119
> Parents: c494064
> Author: Abhinandan Prateek <aprateek@apache.org>
> Authored: Fri Dec 13 11:35:48 2013 +0530
> Committer: Abhinandan Prateek <aprateek@apache.org>
> Committed: Fri Dec 13 11:35:48 2013 +0530
> 
> ----------------------------------------------------------------------
>  tools/build/build_asf.sh | 2 --
>  1 file changed, 2 deletions(-)
> ----------------------------------------------------------------------
> 
> 
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b34dc50/tools/build/build_asf.sh
> ----------------------------------------------------------------------
> diff --git a/tools/build/build_asf.sh b/tools/build/build_asf.sh
> index c2a817a..1a0ad80 100755
> --- a/tools/build/build_asf.sh
> +++ b/tools/build/build_asf.sh
> @@ -91,8 +91,6 @@ echo "found $currentversion"
>  
>  echo 'setting version numbers'
>  mvn versions:set -DnewVersion=$version -P vmware -P developer -P systemvm -P simulator
-P baremetal -P ucs -Dnonoss
> -mv deps/XenServerJava/pom.xml.versionsBackup deps/XenServerJava/pom.xml
> -perl -pi -e "s/-SNAPSHOT//" deps/XenServerJava/pom.xml
>  perl -pi -e "s/-SNAPSHOT//" tools/apidoc/pom.xml
>  case "$currentversion" in 
>    *-SNAPSHOT*)
> 

-1 to this change

The reason that we have to do this weird stuff is that there are
actually 2 version numbers in deps/XenServerJava/pom.xml that matter.
They are:

>  <parent>
>    <groupId>org.apache.cloudstack</groupId>
>    <artifactId>cloudstack</artifactId>
>    <version>4.2.1-SNAPSHOT</version>

The parent project version ^^

>    <relativePath>../../pom.xml</relativePath>
>  </parent>
>  <artifactId>xapi</artifactId>
>  <version>5.6.100-1-SNAPSHOT</version>

The specific project version ^^

For all previous releases, we have been releasing this specific pom.xml
file with the appropriate *non SNAPSHOT* versions for both the parent 
version number and the XenServerJava project's version number
(specifically setting the latter to 5.6.100-1).

Since we are releasing the XenServerJava code as part of ACS, why would
we leave the SNAPSHOT in there?

Did something change that requires it to be added back?

-chip

Mime
View raw message