maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
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 GMT
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <!-- NOTE: The base directory name of this project deliberately does not match its artifact
id! -->
+
+  <parent>
+    <groupId>org.apache.maven.its.mng3846</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>ap</artifactId>
+  <packaging>pom</packaging>
+  <name>Another Parent to test multi-level URL adjustment</name>
+</project>

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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <!-- NOTE: The base directory name of this project deliberately does not match its artifact
id! -->
+
+  <parent>
+    <groupId>org.apache.maven.its.mng3846</groupId>
+    <artifactId>ap</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child</artifactId>
+  <name>Child Project</name>
+</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



Mime
View raw message