Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 98382 invoked from network); 23 Sep 2008 20:03:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Sep 2008 20:03:55 -0000 Received: (qmail 33402 invoked by uid 500); 23 Sep 2008 20:03:53 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 33377 invoked by uid 500); 23 Sep 2008 20:03:53 -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 33368 invoked by uid 99); 23 Sep 2008 20:03:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Sep 2008 13:03:53 -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, 23 Sep 2008 20:03:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2BCA823889FC; Tue, 23 Sep 2008 13:03:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r698324 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java Date: Tue, 23 Sep 2008 20:03:05 -0000 To: notifications@ant.apache.org From: maartenc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080923200305.2BCA823889FC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: maartenc Date: Tue Sep 23 13:03:04 2008 New Revision: 698324 URL: http://svn.apache.org/viewvc?rev=698324&view=rev Log: FIX: Ivy can't handle bare POM ${groupId} property (IVY-913) (thanks to Tom Widmer) Modified: ant/ivy/core/trunk/CHANGES.txt ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java Modified: ant/ivy/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=698324&r1=698323&r2=698324&view=diff ============================================================================== --- ant/ivy/core/trunk/CHANGES.txt (original) +++ ant/ivy/core/trunk/CHANGES.txt Tue Sep 23 13:03:04 2008 @@ -71,6 +71,7 @@ Jason Trump Tjeerd Verhagen James P. White + Tom Widmer John Williams Patrick Woodworth Jaroslaw Wypychowski @@ -84,6 +85,7 @@ - FIX: Cannot configure items with java.io.File attributes (IVY-905) - FIX: Environment properties in ivy settings are no longer resolved (IVY-907) - FIX: Resolve failed on certain proxy environment (IVY-911) +- FIX: Ivy can't handle bare POM ${groupId} property (IVY-913) (thanks to Tom Widmer) 2.0.0-rc1 ===================================== Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java?rev=698324&r1=698323&r2=698324&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java Tue Sep 23 13:03:04 2008 @@ -190,8 +190,10 @@ } else { domReader.setProperty("project.groupId", groupId); domReader.setProperty("pom.groupId", groupId); + domReader.setProperty("groupId", groupId); domReader.setProperty("project.artifactId", artifactId); domReader.setProperty("pom.artifactId", artifactId); + domReader.setProperty("artifactId", artifactId); domReader.setProperty("project.version", version); domReader.setProperty("pom.version", version); domReader.setProperty("version", version);