Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 36759 invoked from network); 23 Sep 2008 21:03:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Sep 2008 21:03:04 -0000 Received: (qmail 69190 invoked by uid 500); 23 Sep 2008 21:03:02 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 69168 invoked by uid 500); 23 Sep 2008 21:03:02 -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 69158 invoked by uid 99); 23 Sep 2008 21:03:02 -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 14:03:02 -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 21:02:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9DE9923888A3; Tue, 23 Sep 2008 14:02:11 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r698347 - in /ant/ivy/core/branches/2.0.x: ./ CHANGES.txt src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom Date: Tue, 23 Sep 2008 21:02:11 -0000 To: notifications@ant.apache.org From: maartenc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080923210211.9DE9923888A3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: maartenc Date: Tue Sep 23 14:02:10 2008 New Revision: 698347 URL: http://svn.apache.org/viewvc?rev=698347&view=rev Log: Merged changes for IVY-914 from trunk. Modified: ant/ivy/core/branches/2.0.x/ (props changed) ant/ivy/core/branches/2.0.x/CHANGES.txt ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom Propchange: ant/ivy/core/branches/2.0.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 23 14:02:10 2008 @@ -1 +1 @@ -/ant/ivy/core/trunk:695737,696014-696031,698324 +/ant/ivy/core/trunk:695737,696014-696031,698324,698345 Modified: ant/ivy/core/branches/2.0.x/CHANGES.txt URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/CHANGES.txt?rev=698347&r1=698346&r2=698347&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/CHANGES.txt (original) +++ ant/ivy/core/branches/2.0.x/CHANGES.txt Tue Sep 23 14:02:10 2008 @@ -86,6 +86,7 @@ - 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) +- FIX: Properties needed to parse version in POM (IVY-914) (thanks to Tom Widmer) 2.0.0-rc1 Modified: ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java?rev=698347&r1=698346&r2=698347&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java (original) +++ ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java Tue Sep 23 14:02:10 2008 @@ -113,6 +113,13 @@ try { PomReader domReader = new PomReader(descriptorURL, res); domReader.setProperty("parent.version", domReader.getParentVersion()); + + Map pomProperties = domReader.getPomProperties(); + for (Iterator iter = pomProperties.entrySet().iterator(); iter.hasNext();) { + Map.Entry prop = (Map.Entry) iter.next(); + domReader.setProperty((String) prop.getKey(), (String) prop.getValue()); + mdBuilder.addProperty((String) prop.getKey(), (String) prop.getValue()); + } ModuleDescriptor parentDescr = null; if (domReader.hasParent()) { @@ -198,13 +205,6 @@ domReader.setProperty("pom.version", version); domReader.setProperty("version", version); - Map pomProperties = domReader.getPomProperties(); - for (Iterator iter = pomProperties.entrySet().iterator(); iter.hasNext();) { - Map.Entry prop = (Map.Entry) iter.next(); - domReader.setProperty((String) prop.getKey(), (String) prop.getValue()); - mdBuilder.addProperty((String) prop.getKey(), (String) prop.getValue()); - } - if (parentDescr != null) { mdBuilder.addExtraInfos(parentDescr.getExtraInfo()); Modified: ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom?rev=698347&r1=698346&r2=698347&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom (original) +++ ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom Tue Sep 23 14:02:10 2008 @@ -21,7 +21,7 @@ drools drools-smf Drools :: Semantics Module Framework - 2.0-beta-18 + ${my-version} ${pom.groupId} @@ -29,4 +29,7 @@ ${pom.version} + + 2.0-beta-18 +