Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 74750 invoked from network); 14 Oct 2008 19:28:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Oct 2008 19:28:32 -0000 Received: (qmail 28545 invoked by uid 500); 14 Oct 2008 19:28:33 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 28521 invoked by uid 500); 14 Oct 2008 19:28:33 -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 28512 invoked by uid 99); 14 Oct 2008 19:28:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Oct 2008 12:28:33 -0700 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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Oct 2008 19:27:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BB7AA238887D; Tue, 14 Oct 2008 12:28:11 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r704631 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/core/event/IvyEvent.java src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java Date: Tue, 14 Oct 2008 19:28:11 -0000 To: notifications@ant.apache.org From: maartenc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081014192811.BB7AA238887D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: maartenc Date: Tue Oct 14 12:28:11 2008 New Revision: 704631 URL: http://svn.apache.org/viewvc?rev=704631&view=rev Log: FIX: pre-resolve-dependency event doesn't export branch information (IVY-941) (thanks to Jaroslaw Wypychowski) Modified: ant/ivy/core/trunk/CHANGES.txt ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java Modified: ant/ivy/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=704631&r1=704630&r2=704631&view=diff ============================================================================== --- ant/ivy/core/trunk/CHANGES.txt (original) +++ ant/ivy/core/trunk/CHANGES.txt Tue Oct 14 12:28:11 2008 @@ -103,6 +103,7 @@ - FIX: Default retrieve, publish and deliver patterns doesn't include the [classifier] token (IVY-935) - FIX: Can't use latest.release for pom dependencies (IVY-936) - FIX: Unable to resolve snapshot versions depending on xml elements order (IVY-940) +- FIX: pre-resolve-dependency event doesn't export branch information (IVY-941) (thanks to Jaroslaw Wypychowski) 2.0.0-rc1 ===================================== Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java?rev=704631&r1=704630&r2=704631&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java Tue Oct 14 12:28:11 2008 @@ -66,6 +66,7 @@ protected void addMridAttributes(ModuleRevisionId mrid) { addModuleIdAttributes(mrid.getModuleId()); addAttribute("revision", mrid.getRevision()); + addAttribute("branch",mrid.getBranch()); addAttributes(mrid.getQualifiedExtraAttributes()); addAttributes(mrid.getExtraAttributes()); } Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java?rev=704631&r1=704630&r2=704631&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java Tue Oct 14 12:28:11 2008 @@ -41,6 +41,8 @@ dd.getDependencyRevisionId().getRevision()); addAttribute("req-revision-dynamic", dd.getDynamicConstraintDependencyRevisionId().getRevision()); + addAttribute("req-branch", requestedRevisionId.getBranch()); + addAttribute("req-branch-default", dd.getDependencyRevisionId().getBranch()); } public DependencyDescriptor getDependencyDescriptor() {