You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Chip Childers <ch...@apache.org> on 2013/12/13 16:45:20 UTC
Re: git commit: updated refs/heads/4.2 to 2b34dc5
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 <ap...@apache.org>
> Authored: Fri Dec 13 11:35:48 2013 +0530
> Committer: Abhinandan Prateek <ap...@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
Re: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Daan Hoogland <da...@gmail.com>.
Please check again guys, it would seems that my code was used (does
not do a revert but commits on a new branch.
On Wed, Jan 22, 2014 at 6:28 AM, Abhinandan Prateek
<Ab...@citrix.com> wrote:
> One solution was given by Dan where he suggested that for RC we create a
> branch. That I guess is still in review board.
>
> -abhi
>
> On 22/01/14 10:42 am, "Animesh Chaturvedi" <an...@citrix.com>
> wrote:
>
>>That seems kludgy we need an elegant solution
>>
>>-----Original Message-----
>>From: Abhinandan Prateek
>>Sent: Tuesday, January 21, 2014 9:11 PM
>>To: dev@cloudstack.apache.org
>>Cc: Animesh Chaturvedi
>>Subject: Re: git commit: updated refs/heads/4.2 to 2b34dc5
>>
>>I looked at 4.3-forward and it seems the revert commit is missing. That
>>is why the “SNAPSHOT” extension is not restored.
>>
>>On 22/01/14 10:31 am, "Abhinandan Prateek" <Ab...@citrix.com>
>>wrote:
>>
>>>Animesh,
>>>
>>> When you run build_asf script it does the following:
>>>
>>>1. Removes the -SNAPSHOT extensions from all version numbers, including
>>>xapi.
>>>2. It creates a commit for this updated pom.xml without the extension.
>>>Generates a tag too.
>>>3. It does all the building stuff etc.
>>>4. Reverses the commit created in 2.
>>>
>>>Now if you push the commits, you should see 2 commits: one commit
>>>changing versions and second reverting it, the branch returns to the
>>>pre-build state where ³-SNAPSHOT² is restored.
>>>
>>>-abhi
>>>
>>>On 22/01/14 10:15 am, "Animesh Chaturvedi"
>>><an...@citrix.com>
>>>wrote:
>>>
>>>>I ran into this issue again with tools/build/build_asf.sh while
>>>>building
>>>>4.3 RC. I have gotten around it locally with help from Sheng but do
>>>>not know what it the correct way to fix it. I have reopened
>>>>CLOUDSTACK-4827
>>>>
>>>>Any help is appreciated
>>>>
>>>>-----Original Message-----
>>>>From: Wei Zhou [mailto:w.zhou@leaseweb.com]
>>>>Sent: Monday, December 16, 2013 2:25 AM
>>>>To: Abhinandan Prateek; dev@cloudstack.apache.org
>>>>Cc: aprateek@apache.org
>>>>Subject: RE: git commit: updated refs/heads/4.2 to 2b34dc5
>>>>
>>>>Abhi, Chips
>>>>
>>>>The issue CLOUDSTACK-4827 happened when one build 4.2 (with
>>>>xapi-5.6.100-1) if compiled 4.1 (with xapi-5.6.100-1-SNAPSHOT) before.
>>>>
>>>>I just tested some times (built 4.1 at first, then 4.2 with
>>>>xapi-5.6.100-1), the issue did not appear. It is weird.
>>>>Now I vote +1 on removing -SNAPSHOT as I cannot reproduce it.
>>>>If anyone meet this issue later, they can fix it by removing the
>>>>org/apache/cloudstack/xapi/ folder in local maven repository.
>>>>
>>>>
>>>>Kind Regards,
>>>>
>>>>Wei ZHOU
>>>>Innovation Engineer Cloud, LeaseWeb B.V.
>>>>w.zhou@leaseweb.com
>>>>
>>>>-----Original Message-----
>>>>From: Abhinandan Prateek [mailto:Abhinandan.Prateek@citrix.com]
>>>>Sent: zaterdag, 14 december, 2013 04:02
>>>>To: dev@cloudstack.apache.org
>>>>Cc: aprateek@apache.org; Wei Zhou
>>>>Subject: Re: git commit: updated refs/heads/4.2 to 2b34dc5
>>>>
>>>>
>>>>
>>>>On 13/12/13 9:20 pm, "Chip Childers" <ch...@apache.org> wrote:
>>>>>>
>>>>>> > <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
>>>>>
>>>>>I'll also point out that the reason that this is doing a mv then the
>>>>>perl string changes is that there used to be a bug in the mvn
>>>>>versions plugin that changed the XenServerJava version to the ACS
>>>>>version. This appears to have been fixed (just tested). So
>>>>>actually, the mv can be removed or not, it doesn't really matter
>>>>>because it's basically a noop.
>>>>>
>>>>>However -1 still stands unless someone convinces me that we should
>>>>>release the XenServerJava project with -SNAPSHOT. IIRC, that
>>>>>actually caused problems for us somehow (but I can't find a reference
>>>>>to that to back up my sometimes fuzzy memory).
>>>>>
>>>>
>>>>I was pointed to this ticket CLOUDSTACK-4827. The info is not very
>>>>clear and it appears that this fixes probably a bad version for the
>>>>repo, and not for the build.
>>>>
>>>>-abhi
>>>>
>>>>>
>>>>
>>>
>>
>
Re: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Abhinandan Prateek <Ab...@citrix.com>.
One solution was given by Dan where he suggested that for RC we create a
branch. That I guess is still in review board.
-abhi
On 22/01/14 10:42 am, "Animesh Chaturvedi" <an...@citrix.com>
wrote:
>That seems kludgy we need an elegant solution
>
>-----Original Message-----
>From: Abhinandan Prateek
>Sent: Tuesday, January 21, 2014 9:11 PM
>To: dev@cloudstack.apache.org
>Cc: Animesh Chaturvedi
>Subject: Re: git commit: updated refs/heads/4.2 to 2b34dc5
>
>I looked at 4.3-forward and it seems the revert commit is missing. That
>is why the “SNAPSHOT” extension is not restored.
>
>On 22/01/14 10:31 am, "Abhinandan Prateek" <Ab...@citrix.com>
>wrote:
>
>>Animesh,
>>
>> When you run build_asf script it does the following:
>>
>>1. Removes the -SNAPSHOT extensions from all version numbers, including
>>xapi.
>>2. It creates a commit for this updated pom.xml without the extension.
>>Generates a tag too.
>>3. It does all the building stuff etc.
>>4. Reverses the commit created in 2.
>>
>>Now if you push the commits, you should see 2 commits: one commit
>>changing versions and second reverting it, the branch returns to the
>>pre-build state where ³-SNAPSHOT² is restored.
>>
>>-abhi
>>
>>On 22/01/14 10:15 am, "Animesh Chaturvedi"
>><an...@citrix.com>
>>wrote:
>>
>>>I ran into this issue again with tools/build/build_asf.sh while
>>>building
>>>4.3 RC. I have gotten around it locally with help from Sheng but do
>>>not know what it the correct way to fix it. I have reopened
>>>CLOUDSTACK-4827
>>>
>>>Any help is appreciated
>>>
>>>-----Original Message-----
>>>From: Wei Zhou [mailto:w.zhou@leaseweb.com]
>>>Sent: Monday, December 16, 2013 2:25 AM
>>>To: Abhinandan Prateek; dev@cloudstack.apache.org
>>>Cc: aprateek@apache.org
>>>Subject: RE: git commit: updated refs/heads/4.2 to 2b34dc5
>>>
>>>Abhi, Chips
>>>
>>>The issue CLOUDSTACK-4827 happened when one build 4.2 (with
>>>xapi-5.6.100-1) if compiled 4.1 (with xapi-5.6.100-1-SNAPSHOT) before.
>>>
>>>I just tested some times (built 4.1 at first, then 4.2 with
>>>xapi-5.6.100-1), the issue did not appear. It is weird.
>>>Now I vote +1 on removing -SNAPSHOT as I cannot reproduce it.
>>>If anyone meet this issue later, they can fix it by removing the
>>>org/apache/cloudstack/xapi/ folder in local maven repository.
>>>
>>>
>>>Kind Regards,
>>>
>>>Wei ZHOU
>>>Innovation Engineer Cloud, LeaseWeb B.V.
>>>w.zhou@leaseweb.com
>>>
>>>-----Original Message-----
>>>From: Abhinandan Prateek [mailto:Abhinandan.Prateek@citrix.com]
>>>Sent: zaterdag, 14 december, 2013 04:02
>>>To: dev@cloudstack.apache.org
>>>Cc: aprateek@apache.org; Wei Zhou
>>>Subject: Re: git commit: updated refs/heads/4.2 to 2b34dc5
>>>
>>>
>>>
>>>On 13/12/13 9:20 pm, "Chip Childers" <ch...@apache.org> wrote:
>>>>>
>>>>> > <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
>>>>
>>>>I'll also point out that the reason that this is doing a mv then the
>>>>perl string changes is that there used to be a bug in the mvn
>>>>versions plugin that changed the XenServerJava version to the ACS
>>>>version. This appears to have been fixed (just tested). So
>>>>actually, the mv can be removed or not, it doesn't really matter
>>>>because it's basically a noop.
>>>>
>>>>However -1 still stands unless someone convinces me that we should
>>>>release the XenServerJava project with -SNAPSHOT. IIRC, that
>>>>actually caused problems for us somehow (but I can't find a reference
>>>>to that to back up my sometimes fuzzy memory).
>>>>
>>>
>>>I was pointed to this ticket CLOUDSTACK-4827. The info is not very
>>>clear and it appears that this fixes probably a bad version for the
>>>repo, and not for the build.
>>>
>>>-abhi
>>>
>>>>
>>>
>>
>
RE: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Animesh Chaturvedi <an...@citrix.com>.
That seems kludgy we need an elegant solution
-----Original Message-----
From: Abhinandan Prateek
Sent: Tuesday, January 21, 2014 9:11 PM
To: dev@cloudstack.apache.org
Cc: Animesh Chaturvedi
Subject: Re: git commit: updated refs/heads/4.2 to 2b34dc5
I looked at 4.3-forward and it seems the revert commit is missing. That is why the "SNAPSHOT" extension is not restored.
On 22/01/14 10:31 am, "Abhinandan Prateek" <Ab...@citrix.com>
wrote:
>Animesh,
>
> When you run build_asf script it does the following:
>
>1. Removes the -SNAPSHOT extensions from all version numbers, including
>xapi.
>2. It creates a commit for this updated pom.xml without the extension.
>Generates a tag too.
>3. It does all the building stuff etc.
>4. Reverses the commit created in 2.
>
>Now if you push the commits, you should see 2 commits: one commit
>changing versions and second reverting it, the branch returns to the
>pre-build state where ³-SNAPSHOT² is restored.
>
>-abhi
>
>On 22/01/14 10:15 am, "Animesh Chaturvedi"
><an...@citrix.com>
>wrote:
>
>>I ran into this issue again with tools/build/build_asf.sh while
>>building
>>4.3 RC. I have gotten around it locally with help from Sheng but do
>>not know what it the correct way to fix it. I have reopened
>>CLOUDSTACK-4827
>>
>>Any help is appreciated
>>
>>-----Original Message-----
>>From: Wei Zhou [mailto:w.zhou@leaseweb.com]
>>Sent: Monday, December 16, 2013 2:25 AM
>>To: Abhinandan Prateek; dev@cloudstack.apache.org
>>Cc: aprateek@apache.org
>>Subject: RE: git commit: updated refs/heads/4.2 to 2b34dc5
>>
>>Abhi, Chips
>>
>>The issue CLOUDSTACK-4827 happened when one build 4.2 (with
>>xapi-5.6.100-1) if compiled 4.1 (with xapi-5.6.100-1-SNAPSHOT) before.
>>
>>I just tested some times (built 4.1 at first, then 4.2 with
>>xapi-5.6.100-1), the issue did not appear. It is weird.
>>Now I vote +1 on removing -SNAPSHOT as I cannot reproduce it.
>>If anyone meet this issue later, they can fix it by removing the
>>org/apache/cloudstack/xapi/ folder in local maven repository.
>>
>>
>>Kind Regards,
>>
>>Wei ZHOU
>>Innovation Engineer Cloud, LeaseWeb B.V.
>>w.zhou@leaseweb.com
>>
>>-----Original Message-----
>>From: Abhinandan Prateek [mailto:Abhinandan.Prateek@citrix.com]
>>Sent: zaterdag, 14 december, 2013 04:02
>>To: dev@cloudstack.apache.org
>>Cc: aprateek@apache.org; Wei Zhou
>>Subject: Re: git commit: updated refs/heads/4.2 to 2b34dc5
>>
>>
>>
>>On 13/12/13 9:20 pm, "Chip Childers" <ch...@apache.org> wrote:
>>>>
>>>> > <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
>>>
>>>I'll also point out that the reason that this is doing a mv then the
>>>perl string changes is that there used to be a bug in the mvn
>>>versions plugin that changed the XenServerJava version to the ACS
>>>version. This appears to have been fixed (just tested). So
>>>actually, the mv can be removed or not, it doesn't really matter because it's basically a noop.
>>>
>>>However -1 still stands unless someone convinces me that we should
>>>release the XenServerJava project with -SNAPSHOT. IIRC, that
>>>actually caused problems for us somehow (but I can't find a reference
>>>to that to back up my sometimes fuzzy memory).
>>>
>>
>>I was pointed to this ticket CLOUDSTACK-4827. The info is not very
>>clear and it appears that this fixes probably a bad version for the
>>repo, and not for the build.
>>
>>-abhi
>>
>>>
>>
>
Re: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Abhinandan Prateek <Ab...@citrix.com>.
I looked at 4.3-forward and it seems the revert commit is missing. That is
why the “SNAPSHOT” extension is not restored.
On 22/01/14 10:31 am, "Abhinandan Prateek" <Ab...@citrix.com>
wrote:
>Animesh,
>
> When you run build_asf script it does the following:
>
>1. Removes the -SNAPSHOT extensions from all version numbers, including
>xapi.
>2. It creates a commit for this updated pom.xml without the extension.
>Generates a tag too.
>3. It does all the building stuff etc.
>4. Reverses the commit created in 2.
>
>Now if you push the commits, you should see 2 commits: one commit changing
>versions and second reverting it, the branch returns to the pre-build
>state where ³-SNAPSHOT² is restored.
>
>-abhi
>
>On 22/01/14 10:15 am, "Animesh Chaturvedi" <an...@citrix.com>
>wrote:
>
>>I ran into this issue again with tools/build/build_asf.sh while building
>>4.3 RC. I have gotten around it locally with help from Sheng but do not
>>know what it the correct way to fix it. I have reopened CLOUDSTACK-4827
>>
>>Any help is appreciated
>>
>>-----Original Message-----
>>From: Wei Zhou [mailto:w.zhou@leaseweb.com]
>>Sent: Monday, December 16, 2013 2:25 AM
>>To: Abhinandan Prateek; dev@cloudstack.apache.org
>>Cc: aprateek@apache.org
>>Subject: RE: git commit: updated refs/heads/4.2 to 2b34dc5
>>
>>Abhi, Chips
>>
>>The issue CLOUDSTACK-4827 happened when one build 4.2 (with
>>xapi-5.6.100-1) if compiled 4.1 (with xapi-5.6.100-1-SNAPSHOT) before.
>>
>>I just tested some times (built 4.1 at first, then 4.2 with
>>xapi-5.6.100-1), the issue did not appear. It is weird.
>>Now I vote +1 on removing -SNAPSHOT as I cannot reproduce it.
>>If anyone meet this issue later, they can fix it by removing the
>>org/apache/cloudstack/xapi/ folder in local maven repository.
>>
>>
>>Kind Regards,
>>
>>Wei ZHOU
>>Innovation Engineer Cloud, LeaseWeb B.V.
>>w.zhou@leaseweb.com
>>
>>-----Original Message-----
>>From: Abhinandan Prateek [mailto:Abhinandan.Prateek@citrix.com]
>>Sent: zaterdag, 14 december, 2013 04:02
>>To: dev@cloudstack.apache.org
>>Cc: aprateek@apache.org; Wei Zhou
>>Subject: Re: git commit: updated refs/heads/4.2 to 2b34dc5
>>
>>
>>
>>On 13/12/13 9:20 pm, "Chip Childers" <ch...@apache.org> wrote:
>>>>
>>>> > <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
>>>
>>>I'll also point out that the reason that this is doing a mv then the
>>>perl string changes is that there used to be a bug in the mvn versions
>>>plugin that changed the XenServerJava version to the ACS version. This
>>>appears to have been fixed (just tested). So actually, the mv can be
>>>removed or not, it doesn't really matter because it's basically a noop.
>>>
>>>However -1 still stands unless someone convinces me that we should
>>>release the XenServerJava project with -SNAPSHOT. IIRC, that actually
>>>caused problems for us somehow (but I can't find a reference to that to
>>>back up my sometimes fuzzy memory).
>>>
>>
>>I was pointed to this ticket CLOUDSTACK-4827. The info is not very clear
>>and it appears that this fixes probably a bad version for the repo, and
>>not for the build.
>>
>>-abhi
>>
>>>
>>
>
Re: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Abhinandan Prateek <Ab...@citrix.com>.
Animesh,
When you run build_asf script it does the following:
1. Removes the -SNAPSHOT extensions from all version numbers, including
xapi.
2. It creates a commit for this updated pom.xml without the extension.
Generates a tag too.
3. It does all the building stuff etc.
4. Reverses the commit created in 2.
Now if you push the commits, you should see 2 commits: one commit changing
versions and second reverting it, the branch returns to the pre-build
state where ³-SNAPSHOT² is restored.
-abhi
On 22/01/14 10:15 am, "Animesh Chaturvedi" <an...@citrix.com>
wrote:
>I ran into this issue again with tools/build/build_asf.sh while building
>4.3 RC. I have gotten around it locally with help from Sheng but do not
>know what it the correct way to fix it. I have reopened CLOUDSTACK-4827
>
>Any help is appreciated
>
>-----Original Message-----
>From: Wei Zhou [mailto:w.zhou@leaseweb.com]
>Sent: Monday, December 16, 2013 2:25 AM
>To: Abhinandan Prateek; dev@cloudstack.apache.org
>Cc: aprateek@apache.org
>Subject: RE: git commit: updated refs/heads/4.2 to 2b34dc5
>
>Abhi, Chips
>
>The issue CLOUDSTACK-4827 happened when one build 4.2 (with
>xapi-5.6.100-1) if compiled 4.1 (with xapi-5.6.100-1-SNAPSHOT) before.
>
>I just tested some times (built 4.1 at first, then 4.2 with
>xapi-5.6.100-1), the issue did not appear. It is weird.
>Now I vote +1 on removing -SNAPSHOT as I cannot reproduce it.
>If anyone meet this issue later, they can fix it by removing the
>org/apache/cloudstack/xapi/ folder in local maven repository.
>
>
>Kind Regards,
>
>Wei ZHOU
>Innovation Engineer Cloud, LeaseWeb B.V.
>w.zhou@leaseweb.com
>
>-----Original Message-----
>From: Abhinandan Prateek [mailto:Abhinandan.Prateek@citrix.com]
>Sent: zaterdag, 14 december, 2013 04:02
>To: dev@cloudstack.apache.org
>Cc: aprateek@apache.org; Wei Zhou
>Subject: Re: git commit: updated refs/heads/4.2 to 2b34dc5
>
>
>
>On 13/12/13 9:20 pm, "Chip Childers" <ch...@apache.org> wrote:
>>>
>>> > <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
>>
>>I'll also point out that the reason that this is doing a mv then the
>>perl string changes is that there used to be a bug in the mvn versions
>>plugin that changed the XenServerJava version to the ACS version. This
>>appears to have been fixed (just tested). So actually, the mv can be
>>removed or not, it doesn't really matter because it's basically a noop.
>>
>>However -1 still stands unless someone convinces me that we should
>>release the XenServerJava project with -SNAPSHOT. IIRC, that actually
>>caused problems for us somehow (but I can't find a reference to that to
>>back up my sometimes fuzzy memory).
>>
>
>I was pointed to this ticket CLOUDSTACK-4827. The info is not very clear
>and it appears that this fixes probably a bad version for the repo, and
>not for the build.
>
>-abhi
>
>>
>
RE: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Animesh Chaturvedi <an...@citrix.com>.
I ran into this issue again with tools/build/build_asf.sh while building 4.3 RC. I have gotten around it locally with help from Sheng but do not know what it the correct way to fix it. I have reopened CLOUDSTACK-4827
Any help is appreciated
-----Original Message-----
From: Wei Zhou [mailto:w.zhou@leaseweb.com]
Sent: Monday, December 16, 2013 2:25 AM
To: Abhinandan Prateek; dev@cloudstack.apache.org
Cc: aprateek@apache.org
Subject: RE: git commit: updated refs/heads/4.2 to 2b34dc5
Abhi, Chips
The issue CLOUDSTACK-4827 happened when one build 4.2 (with xapi-5.6.100-1) if compiled 4.1 (with xapi-5.6.100-1-SNAPSHOT) before.
I just tested some times (built 4.1 at first, then 4.2 with xapi-5.6.100-1), the issue did not appear. It is weird.
Now I vote +1 on removing -SNAPSHOT as I cannot reproduce it.
If anyone meet this issue later, they can fix it by removing the org/apache/cloudstack/xapi/ folder in local maven repository.
Kind Regards,
Wei ZHOU
Innovation Engineer Cloud, LeaseWeb B.V.
w.zhou@leaseweb.com
-----Original Message-----
From: Abhinandan Prateek [mailto:Abhinandan.Prateek@citrix.com]
Sent: zaterdag, 14 december, 2013 04:02
To: dev@cloudstack.apache.org
Cc: aprateek@apache.org; Wei Zhou
Subject: Re: git commit: updated refs/heads/4.2 to 2b34dc5
On 13/12/13 9:20 pm, "Chip Childers" <ch...@apache.org> wrote:
>>
>> > <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
>
>I'll also point out that the reason that this is doing a mv then the
>perl string changes is that there used to be a bug in the mvn versions
>plugin that changed the XenServerJava version to the ACS version. This
>appears to have been fixed (just tested). So actually, the mv can be
>removed or not, it doesn't really matter because it's basically a noop.
>
>However -1 still stands unless someone convinces me that we should
>release the XenServerJava project with -SNAPSHOT. IIRC, that actually
>caused problems for us somehow (but I can't find a reference to that to
>back up my sometimes fuzzy memory).
>
I was pointed to this ticket CLOUDSTACK-4827. The info is not very clear and it appears that this fixes probably a bad version for the repo, and not for the build.
-abhi
>
RE: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Wei Zhou <w....@leaseweb.com>.
Abhi, Chips
The issue CLOUDSTACK-4827 happened when one build 4.2 (with xapi-5.6.100-1) if compiled 4.1 (with xapi-5.6.100-1-SNAPSHOT) before.
I just tested some times (built 4.1 at first, then 4.2 with xapi-5.6.100-1), the issue did not appear. It is weird.
Now I vote +1 on removing -SNAPSHOT as I cannot reproduce it.
If anyone meet this issue later, they can fix it by removing the org/apache/cloudstack/xapi/ folder in local maven repository.
Kind Regards,
Wei ZHOU
Innovation Engineer Cloud, LeaseWeb B.V.
w.zhou@leaseweb.com
-----Original Message-----
From: Abhinandan Prateek [mailto:Abhinandan.Prateek@citrix.com]
Sent: zaterdag, 14 december, 2013 04:02
To: dev@cloudstack.apache.org
Cc: aprateek@apache.org; Wei Zhou
Subject: Re: git commit: updated refs/heads/4.2 to 2b34dc5
On 13/12/13 9:20 pm, "Chip Childers" <ch...@apache.org> wrote:
>>
>> > <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
>
>I'll also point out that the reason that this is doing a mv then the
>perl string changes is that there used to be a bug in the mvn versions
>plugin that changed the XenServerJava version to the ACS version. This
>appears to have been fixed (just tested). So actually, the mv can be
>removed or not, it doesn't really matter because it's basically a noop.
>
>However -1 still stands unless someone convinces me that we should
>release the XenServerJava project with -SNAPSHOT. IIRC, that actually
>caused problems for us somehow (but I can't find a reference to that to
>back up my sometimes fuzzy memory).
>
I was pointed to this ticket CLOUDSTACK-4827. The info is not very clear and it appears that this fixes probably a bad version for the repo, and not for the build.
-abhi
>
Re: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Daan Hoogland <da...@gmail.com>.
On Tue, Dec 17, 2013 at 2:49 PM, Abhinandan Prateek
<Ab...@citrix.com> wrote:
> The problem is that while you are verifying the build and someone
> pushes some code your commit ids will change on a rebase.
let the build be based on a commit and create the branch on that. Then
other commits won't hurt.
The rebase be in the discipline of the release manager.
I have been looking at the script 'build_asf' and it seems to already
have tag functionality. I would like to remove it.
my hidden agenda for these remarks is the thought of being able to
release from master at any moment. The present form of the build
script is to be adjusted for this I think. All the script should do is
take a release branch, for instance master, replace the version
numbers in the poms and check it in as a RC branch (which should not
be touched for anything but transforming the RC to a release)
ideally the script will take a commit as parameter to base itself on
and could figure out the default as being the last one that was
committed on the current branch when started.
Can anybody contradict me when I say I am on the rigfht track, please?
thanks,
Daan
Re: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Abhinandan Prateek <Ab...@citrix.com>.
+1 to creation of a branch on cutting first RC, this will require update
to the release procedure doc that I followed.
This can save some trouble. Also we can have the build_asf do a git push,
of the versioning commits generated by it, automatically if it is not a
dry run. The problem is that while you are verifying the build and someone
pushes some code your commit ids will change on a rebase.
As for the revert the change was erroneous and had to be reverted.
Though I am not very sure on why xapi versioning should include
³-SNAPSHOT², my guess is it is because we we make changes to standard xapi.
Hopefully this will go away in future xapi releases.
-abhi
On 17/12/13 5:05 pm, "Daan Hoogland" <da...@gmail.com> wrote:
>is it neccessary to work with a revert? How about creating a
>(mini-)branch next time? This would obsolete my request for a tag on
>the RC as it is in fact. UIt will also make it easier to implement
>fixes that have to do with release instead of functionality.
>
>regards,
>
>On Mon, Dec 16, 2013 at 10:42 AM, Abhinandan Prateek
><Ab...@citrix.com> wrote:
>>
>>
>> On 14/12/13 11:49 pm, "Chip Childers" <ch...@gmail.com> wrote:
>>
>>>On Friday, December 13, 2013, Abhinandan Prateek wrote:
>>>
>>>>
>>>>
>>>> On 13/12/13 9:20 pm, "Chip Childers"
>>>><chipchilders@apache.org<javascript:;>>
>>>> wrote:
>>>> >>
>>>> >> > <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
>>>> >
>>>> >I'll also point out that the reason that this is doing a mv then the
>>>> >perl string changes is that there used to be a bug in the mvn
>>>>versions
>>>> >plugin that changed the XenServerJava version to the ACS version.
>>>>This
>>>> >appears to have been fixed (just tested). So actually, the mv can be
>>>> >removed or not, it doesn't really matter because it's basically a
>>>>noop.
>>>> >
>>>> >However -1 still stands unless someone convinces me that we should
>>>> >release the XenServerJava project with -SNAPSHOT. IIRC, that
>>>>actually
>>>> >caused problems for us somehow (but I can't find a reference to that
>>>>to
>>>> >back up my sometimes fuzzy memory).
>>>> >
>>>>
>>>> I was pointed to this ticket CLOUDSTACK-4827. The info is not very
>>>>clear
>>>> and it appears that this fixes probably a bad version for the repo,
>>>>and
>>>> not for the build.
>>>>
>>>> -abhi
>>
>> The commit is reverted. Will be re-spinning the 4.2.1 now.
>>
>>>
>>
Re: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Daan Hoogland <da...@gmail.com>.
is it neccessary to work with a revert? How about creating a
(mini-)branch next time? This would obsolete my request for a tag on
the RC as it is in fact. UIt will also make it easier to implement
fixes that have to do with release instead of functionality.
regards,
On Mon, Dec 16, 2013 at 10:42 AM, Abhinandan Prateek
<Ab...@citrix.com> wrote:
>
>
> On 14/12/13 11:49 pm, "Chip Childers" <ch...@gmail.com> wrote:
>
>>On Friday, December 13, 2013, Abhinandan Prateek wrote:
>>
>>>
>>>
>>> On 13/12/13 9:20 pm, "Chip Childers"
>>><chipchilders@apache.org<javascript:;>>
>>> wrote:
>>> >>
>>> >> > <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
>>> >
>>> >I'll also point out that the reason that this is doing a mv then the
>>> >perl string changes is that there used to be a bug in the mvn versions
>>> >plugin that changed the XenServerJava version to the ACS version. This
>>> >appears to have been fixed (just tested). So actually, the mv can be
>>> >removed or not, it doesn't really matter because it's basically a noop.
>>> >
>>> >However -1 still stands unless someone convinces me that we should
>>> >release the XenServerJava project with -SNAPSHOT. IIRC, that actually
>>> >caused problems for us somehow (but I can't find a reference to that to
>>> >back up my sometimes fuzzy memory).
>>> >
>>>
>>> I was pointed to this ticket CLOUDSTACK-4827. The info is not very clear
>>> and it appears that this fixes probably a bad version for the repo, and
>>> not for the build.
>>>
>>> -abhi
>
> The commit is reverted. Will be re-spinning the 4.2.1 now.
>
>>
>
Re: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Abhinandan Prateek <Ab...@citrix.com>.
On 14/12/13 11:49 pm, "Chip Childers" <ch...@gmail.com> wrote:
>On Friday, December 13, 2013, Abhinandan Prateek wrote:
>
>>
>>
>> On 13/12/13 9:20 pm, "Chip Childers"
>><chipchilders@apache.org<javascript:;>>
>> wrote:
>> >>
>> >> > <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
>> >
>> >I'll also point out that the reason that this is doing a mv then the
>> >perl string changes is that there used to be a bug in the mvn versions
>> >plugin that changed the XenServerJava version to the ACS version. This
>> >appears to have been fixed (just tested). So actually, the mv can be
>> >removed or not, it doesn't really matter because it's basically a noop.
>> >
>> >However -1 still stands unless someone convinces me that we should
>> >release the XenServerJava project with -SNAPSHOT. IIRC, that actually
>> >caused problems for us somehow (but I can't find a reference to that to
>> >back up my sometimes fuzzy memory).
>> >
>>
>> I was pointed to this ticket CLOUDSTACK-4827. The info is not very clear
>> and it appears that this fixes probably a bad version for the repo, and
>> not for the build.
>>
>> -abhi
The commit is reverted. Will be re-spinning the 4.2.1 now.
>
Re: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Chip Childers <ch...@gmail.com>.
On Friday, December 13, 2013, Abhinandan Prateek wrote:
>
>
> On 13/12/13 9:20 pm, "Chip Childers" <chipchilders@apache.org<javascript:;>>
> wrote:
> >>
> >> > <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
> >
> >I'll also point out that the reason that this is doing a mv then the
> >perl string changes is that there used to be a bug in the mvn versions
> >plugin that changed the XenServerJava version to the ACS version. This
> >appears to have been fixed (just tested). So actually, the mv can be
> >removed or not, it doesn't really matter because it's basically a noop.
> >
> >However -1 still stands unless someone convinces me that we should
> >release the XenServerJava project with -SNAPSHOT. IIRC, that actually
> >caused problems for us somehow (but I can't find a reference to that to
> >back up my sometimes fuzzy memory).
> >
>
> I was pointed to this ticket CLOUDSTACK-4827. The info is not very clear
> and it appears that this fixes probably a bad version for the repo, and
> not for the build.
>
> -abhi
Please revert your commit.
>
> >
>
>
Re: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Abhinandan Prateek <Ab...@citrix.com>.
On 13/12/13 9:20 pm, "Chip Childers" <ch...@apache.org> wrote:
>>
>> > <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
>
>I'll also point out that the reason that this is doing a mv then the
>perl string changes is that there used to be a bug in the mvn versions
>plugin that changed the XenServerJava version to the ACS version. This
>appears to have been fixed (just tested). So actually, the mv can be
>removed or not, it doesn't really matter because it's basically a noop.
>
>However -1 still stands unless someone convinces me that we should
>release the XenServerJava project with -SNAPSHOT. IIRC, that actually
>caused problems for us somehow (but I can't find a reference to that to
>back up my sometimes fuzzy memory).
>
I was pointed to this ticket CLOUDSTACK-4827. The info is not very clear
and it appears that this fixes probably a bad version for the repo, and
not for the build.
-abhi
>
Re: git commit: updated refs/heads/4.2 to 2b34dc5
Posted by Chip Childers <ch...@apache.org>.
On Fri, Dec 13, 2013 at 10:45:20AM -0500, Chip Childers wrote:
> 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 <ap...@apache.org>
> > Authored: Fri Dec 13 11:35:48 2013 +0530
> > Committer: Abhinandan Prateek <ap...@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
I'll also point out that the reason that this is doing a mv then the
perl string changes is that there used to be a bug in the mvn versions
plugin that changed the XenServerJava version to the ACS version. This
appears to have been fixed (just tested). So actually, the mv can be
removed or not, it doesn't really matter because it's basically a noop.
However -1 still stands unless someone convinces me that we should
release the XenServerJava project with -SNAPSHOT. IIRC, that actually
caused problems for us somehow (but I can't find a reference to that to
back up my sometimes fuzzy memory).
-chip
now.