Return-Path: Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: (qmail 86841 invoked from network); 24 Jun 2009 21:39:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Jun 2009 21:39:20 -0000 Received: (qmail 86226 invoked by uid 500); 24 Jun 2009 21:39:31 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 86169 invoked by uid 500); 24 Jun 2009 21:39:31 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 86160 invoked by uid 99); 24 Jun 2009 21:39:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jun 2009 21:39:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.140] (HELO brutus.apache.org) (140.211.11.140) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jun 2009 21:39:28 +0000 Received: from brutus (localhost [127.0.0.1]) by brutus.apache.org (Postfix) with ESMTP id 5B5FA234C045 for ; Wed, 24 Jun 2009 14:39:07 -0700 (PDT) Message-ID: <664954597.1245879547373.JavaMail.jira@brutus> Date: Wed, 24 Jun 2009 14:39:07 -0700 (PDT) From: "aleksey zhukov (JIRA)" To: notifications@ant.apache.org Subject: [jira] Commented: (IVY-1087) ivy:resolve ignores branch in "dynamic" resolve mode In-Reply-To: <539004828.1243959547532.JavaMail.jira@brutus> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 X-Virus-Checked: Checked by ClamAV on apache.org [ https://issues.apache.org/jira/browse/IVY-1087?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12723754#action_12723754 ] aleksey zhukov commented on IVY-1087: ------------------------------------- OK, I have fixed that. Please review the patch. diff -up ./XmlModuleDescriptorParser.java.orig ./XmlModuleDescriptorParser.java --- ./XmlModuleDescriptorParser.java.orig 2009-06-24 13:15:54.000000000 -0500 +++ ./XmlModuleDescriptorParser.java 2009-06-24 12:12:58.000000000 -0500 @@ -521,6 +521,8 @@ public class XmlModuleDescriptorParser e String name = settings.substitute(attributes.getValue("name")); String branch = settings.substitute(attributes.getValue("branch")); String branchConstraint = settings.substitute(attributes.getValue("branchConstraint")); + branchConstraint = branchConstraint == null ? branch : branchConstraint; + String rev = settings.substitute(attributes.getValue("rev")); String revConstraint = settings.substitute(attributes.getValue("revConstraint")); revConstraint = revConstraint == null ? rev : revConstraint; If this is ok, please add it to the trunk. > ivy:resolve ignores branch in "dynamic" resolve mode > ---------------------------------------------------- > > Key: IVY-1087 > URL: https://issues.apache.org/jira/browse/IVY-1087 > Project: Ivy > Issue Type: Bug > Components: Core > Affects Versions: 2.1.0-RC1 > Environment: Linux 2.6.18-92.1.22.el5 #1 SMP Tue Dec 16 12:03:43 EST 2008 i686 athlon i386 GNU/Linux > Reporter: aleksey zhukov > Priority: Blocker > > When I call ivy:resolve as following > > and having > > > set in my defaultResolver > ivy:resolver ignores [branch] and looks for ivy.xml in "${ivy.local.default.root}/[organisation]//[module]-ivys/ivy-[revision].xml" > and artifact in "${ivy.local.default.root}/[organisation]//[artifact]-[revision].[ext]". > However if I call without resolveMode set, everything is fine and resolve follows [organisation]/[branch] path. -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.