Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 32785 invoked from network); 29 Oct 2008 22:12:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Oct 2008 22:12:47 -0000 Received: (qmail 12869 invoked by uid 500); 29 Oct 2008 22:12:52 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 12846 invoked by uid 500); 29 Oct 2008 22:12:52 -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 12831 invoked by uid 99); 29 Oct 2008 22:12:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Oct 2008 15:12:52 -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; Wed, 29 Oct 2008 22:11:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 689BE23888A5; Wed, 29 Oct 2008 15:12:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r709029 - in /ant/ivy/core/branches/2.0.x: ./ doc/dev/ src/java/org/apache/ivy/ant/ src/java/org/apache/ivy/plugins/parser/m2/ src/java/org/apache/ivy/util/url/ test/java/org/apache/ivy/plugins/parser/m2/ Date: Wed, 29 Oct 2008 22:12:25 -0000 To: notifications@ant.apache.org From: maartenc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081029221226.689BE23888A5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: maartenc Date: Wed Oct 29 15:12:24 2008 New Revision: 709029 URL: http://svn.apache.org/viewvc?rev=709029&view=rev Log: Merged changes from 2.0.0-rc2 branch back into 2.0.x branch. Added: ant/ivy/core/branches/2.0.x/ivysettings-signtask.xml - copied unchanged from r709027, ant/ivy/core/branches/2.0.0-rc2/ivysettings-signtask.xml ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/test-project.parent.version.pom - copied unchanged from r709027, ant/ivy/core/branches/2.0.0-rc2/test/java/org/apache/ivy/plugins/parser/m2/test-project.parent.version.pom 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/build-release.xml ant/ivy/core/branches/2.0.x/build.properties ant/ivy/core/branches/2.0.x/doc/dev/makerelease.html ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/ant/IvyPostResolveTask.java ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/util/url/ApacheURLLister.java ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java Propchange: ant/ivy/core/branches/2.0.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 29 15:12:24 2008 @@ -1 +1,2 @@ +/ant/ivy/core/branches/2.0.0-rc2:707177-709027 /ant/ivy/core/trunk:695737,696014-696031,696442,698318-706770 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=709029&r1=709028&r2=709029&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/CHANGES.txt (original) +++ ant/ivy/core/branches/2.0.x/CHANGES.txt Wed Oct 29 15:12:24 2008 @@ -81,7 +81,7 @@ Patrick Woodworth Jaroslaw Wypychowski - 2.0.x branch + 2.0.0-rc2 ===================================== - DOCUMENTATION: Filesystem resolver: talks about "patterns" but does not mention these must become absolute file paths (IVY-910) @@ -117,6 +117,8 @@ - FIX: Maven pom license url can contain xml entities (IVY-950) - FIX: Maven pom license has name as optional element (IVY-949) - FIX: Ivy doesn't throw an error when the parent POM cannot be loaded (IVY-931) +- FIX: Maven pom parser is not handling pom property ${project.parent.version} (IVY-955) +- FIX: inline resolve ignores the transitive attribute (IVY-958) 2.0.0-rc1 ===================================== Modified: ant/ivy/core/branches/2.0.x/build-release.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/build-release.xml?rev=709029&r1=709028&r2=709029&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/build-release.xml (original) +++ ant/ivy/core/branches/2.0.x/build-release.xml Wed Oct 29 15:12:24 2008 @@ -18,7 +18,8 @@ --> + xmlns:xooki="antlib:xooki" + xmlns:openpgp="antlib:org.apache.commons.openpgp.ant"> @@ -201,8 +202,67 @@ - - + + Setting version to ${build.version} + + + + + + + + Setting status to ${status} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 8. Launch the release script -ant -Dbuild.version=2.0.0-beta1 -Dstatus=milestone -f build-release.xml release +ant -f build-release.xml release The status should be release only for final releases, and milestone for any other intermediate release. If anything is wrong, fix and go back to step 4. Modified: ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/ant/IvyPostResolveTask.java URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/ant/IvyPostResolveTask.java?rev=709029&r1=709028&r2=709029&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/ant/IvyPostResolveTask.java (original) +++ ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/ant/IvyPostResolveTask.java Wed Oct 29 15:12:24 2008 @@ -133,6 +133,7 @@ resolve.setInline(true); resolve.setConf(conf); resolve.setResolveId(resolveId); + resolve.setTransitive(isTransitive()); resolve.execute(); } else { Message.verbose("inline resolve already done for " + getOrganisation() + " " 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=709029&r1=709028&r2=709029&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 Wed Oct 29 15:12:24 2008 @@ -114,6 +114,7 @@ try { PomReader domReader = new PomReader(descriptorURL, res); domReader.setProperty("parent.version", domReader.getParentVersion()); + domReader.setProperty("project.parent.version", domReader.getParentVersion()); Map pomProperties = domReader.getPomProperties(); for (Iterator iter = pomProperties.entrySet().iterator(); iter.hasNext();) { Modified: ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/util/url/ApacheURLLister.java URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/util/url/ApacheURLLister.java?rev=709029&r1=709028&r2=709029&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/util/url/ApacheURLLister.java (original) +++ ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/util/url/ApacheURLLister.java Wed Oct 29 15:12:24 2008 @@ -125,6 +125,11 @@ } text = text.trim(); + + if (href.startsWith("../")) { + // we are only interested in sub-URLs, not parent URLs, so skip this one + continue; + } // absolute href: convert to relative one if (href.startsWith("/")) { Modified: ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java?rev=709029&r1=709028&r2=709029&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java (original) +++ ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java Wed Oct 29 15:12:24 2008 @@ -190,6 +190,20 @@ assertEquals("test", artifact[0].getName()); } + public void testProjectParentVersion() throws Exception { + ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor( + settings, getClass().getResource("test-project.parent.version.pom"), false); + assertNotNull(md); + + ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "test", "1.0"); + assertEquals(mrid, md.getModuleRevisionId()); + + Artifact[] artifact = md.getArtifacts("master"); + assertEquals(1, artifact.length); + assertEquals(mrid, artifact[0].getModuleRevisionId()); + assertEquals("test", artifact[0].getName()); + } + public void testDependencies() throws Exception { ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor( settings, getClass().getResource("test-dependencies.pom"), false);