Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 62978 invoked from network); 22 Mar 2009 10:38:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Mar 2009 10:38:27 -0000 Received: (qmail 87088 invoked by uid 500); 22 Mar 2009 10:38:27 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 86981 invoked by uid 500); 22 Mar 2009 10:38:27 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 86972 invoked by uid 99); 22 Mar 2009 10:38:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Mar 2009 10:38:27 +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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Mar 2009 10:38:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A2CFF23888D5; Sun, 22 Mar 2009 10:37:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r757168 - in /maven/components/trunk/maven-project/src/test: java/org/apache/maven/project/ resources-project-builder/url-inheritance/another-parent/ resources-project-builder/url-inheritance/another-parent/sub/ Date: Sun, 22 Mar 2009 10:37:57 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090322103757.A2CFF23888D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bentmann Date: Sun Mar 22 10:37:56 2009 New Revision: 757168 URL: http://svn.apache.org/viewvc?rev=757168&view=rev Log: [MNG-3846] [regression] Inherited URLs are not automatically extended with the child's artifactId o Extended UT to test deeper inheritance hierarchy Added: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/ (with props) maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml (with props) maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/ (with props) maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml (with props) Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=757168&r1=757167&r2=757168&view=diff ============================================================================== --- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java (original) +++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java Sun Mar 22 10:37:56 2009 @@ -563,6 +563,25 @@ assertEquals( "http://parent.url/download", pom.getValue( "distributionManagement/downloadUrl" ) ); } + /* FIXME: MNG-3846 + public void testAppendArtifactIdOfParentAndChildToInheritedUrls() + throws Exception + { + PomTestWrapper pom = buildPom( "url-inheritance/another-parent/sub" ); + assertEquals( "http://parent.url/ap/child", pom.getValue( "url" ) ); + assertEquals( "http://parent.url/org/", pom.getValue( "organization/url" ) ); + assertEquals( "http://parent.url/license.txt", pom.getValue( "licenses[1]/url" ) ); + assertEquals( "http://parent.url/viewvc/ap/child", pom.getValue( "scm/url" ) ); + assertEquals( "http://parent.url/scm/ap/child", pom.getValue( "scm/connection" ) ); + assertEquals( "https://parent.url/scm/ap/child", pom.getValue( "scm/developerConnection" ) ); + assertEquals( "http://parent.url/issues", pom.getValue( "issueManagement/url" ) ); + assertEquals( "http://parent.url/ci", pom.getValue( "ciManagement/url" ) ); + assertEquals( "http://parent.url/dist", pom.getValue( "distributionManagement/repository/url" ) ); + assertEquals( "http://parent.url/snaps", pom.getValue( "distributionManagement/snapshotRepository/url" ) ); + assertEquals( "http://parent.url/site/ap/child", pom.getValue( "distributionManagement/site/url" ) ); + assertEquals( "http://parent.url/download", pom.getValue( "distributionManagement/downloadUrl" ) ); + } + //*/ public void testNonInheritedElementsInSubtreesOverriddenByChild() throws Exception Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/ ------------------------------------------------------------------------------ bugtraq:label = Enter issue ID: Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/ ------------------------------------------------------------------------------ bugtraq:message = Issue id: %BUGID% Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/ ------------------------------------------------------------------------------ bugtraq:number = false Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/ ------------------------------------------------------------------------------ bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Added: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml?rev=757168&view=auto ============================================================================== --- maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml (added) +++ maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml Sun Mar 22 10:37:56 2009 @@ -0,0 +1,36 @@ + + + + + + 4.0.0 + + + + + org.apache.maven.its.mng3846 + parent + 0.1 + + + ap + pom + Another Parent to test multi-level URL adjustment + Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/ ------------------------------------------------------------------------------ bugtraq:label = Enter issue ID: Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/ ------------------------------------------------------------------------------ bugtraq:message = Issue id: %BUGID% Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/ ------------------------------------------------------------------------------ bugtraq:number = false Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/ ------------------------------------------------------------------------------ bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Added: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml?rev=757168&view=auto ============================================================================== --- maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml (added) +++ maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml Sun Mar 22 10:37:56 2009 @@ -0,0 +1,35 @@ + + + + + + 4.0.0 + + + + + org.apache.maven.its.mng3846 + ap + 0.1 + + + child + Child Project + Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision