From dev-return-50581-apmail-cloudstack-dev-archive=cloudstack.apache.org@cloudstack.apache.org Wed Jan 22 14:29:43 2014 Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B249510A2D for ; Wed, 22 Jan 2014 14:29:43 +0000 (UTC) Received: (qmail 99056 invoked by uid 500); 22 Jan 2014 14:29:43 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 99026 invoked by uid 500); 22 Jan 2014 14:29:42 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 99018 invoked by uid 99); 22 Jan 2014 14:29:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jan 2014 14:29:42 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of daan.hoogland@gmail.com designates 209.85.223.173 as permitted sender) Received: from [209.85.223.173] (HELO mail-ie0-f173.google.com) (209.85.223.173) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jan 2014 14:29:38 +0000 Received: by mail-ie0-f173.google.com with SMTP id e14so11585500iej.4 for ; Wed, 22 Jan 2014 06:29:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; bh=RagaVdW+9vqV86UVmtgEkY6bPBVZjmZe/8+XAAaiv7Y=; b=YXkBmVqq0T7XRb3eNewuj3uc55NR10GaxQcJ+dAHG8Pui9KWtFb7pEpJkLpsrbxCSz 2XgH0YDYIAOooEzQ6kMhHuB5hmvlzVLvFCtRaPPHkz3nSY+ZBkAn6Q5DGPvlw1fp8db5 lk4mWqpfSzdQAjuDOSTxPDN8v8iEVP9vFo2wc2xOtsBK7ev5CWtv5I10CUTRgi/C9Lq4 FOfVACqsTv/rgH8tCbiFtPnXs55kAfQvmcWLC64OiBu2G0X10sjmVPxPykbdXxTxXO1h Nc7piCSZ/VLZ+/+7Ya1AJIFlmDhmx4BWTbdRjfQn1r+JUlJDLUWe7vtxwMojFagIf/OR RGKQ== X-Received: by 10.42.156.72 with SMTP id y8mr1333116icw.25.1390400958271; Wed, 22 Jan 2014 06:29:18 -0800 (PST) MIME-Version: 1.0 Received: by 10.64.226.135 with HTTP; Wed, 22 Jan 2014 06:28:58 -0800 (PST) In-Reply-To: References: <5cd42de19fb142f3a9eba9adac5f4cd3@git.apache.org> <20131213154520.GL62753@Chips-MacBook-Air.local> <20131213155052.GM62753@Chips-MacBook-Air.local> From: Daan Hoogland Date: Wed, 22 Jan 2014 15:28:58 +0100 Message-ID: Subject: Re: git commit: updated refs/heads/4.2 to 2b34dc5 To: dev Cc: Animesh Chaturvedi Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org 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 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" > 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 =93SNAPSHOT=94 extension is not restored. >> >>On 22/01/14 10:31 am, "Abhinandan Prateek" >>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 =B3-SNAPSHOT=B2 is restored. >>> >>>-abhi >>> >>>On 22/01/14 10:15 am, "Animesh Chaturvedi" >>> >>>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" wrote: >>>>>> >>>>>> > xapi >>>>>> > 5.6.100-1-SNAPSHOT >>>>>> >>>>>> 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 >>>> >>>>> >>>> >>> >> >