[MNG-5871] refactoring: improved empty urls handling

apache · Oct 31, 2015 · 2f7daef · 2f7daef
1 parent 406a46f
commit 2f7daef
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/...builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/...builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
@@ -35,6 +35,7 @@
 import org.apache.maven.model.building.ModelProblemCollector;
 import org.apache.maven.model.merge.MavenModelMerger;
 import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * Handles inheritance of model values.
@@ -136,7 +137,7 @@ protected String extrapolateChildUrl( String parentUrl, Map<Object, Object> cont
             Object artifactId = context.get( ARTIFACT_ID );
             Object childPathAdjustment = context.get( CHILD_PATH_ADJUSTMENT );
 
-            if ( artifactId != null && childPathAdjustment != null )
+            if ( artifactId != null && childPathAdjustment != null && StringUtils.isNotBlank( parentUrl ) )
             {
                 // append childPathAdjustment and artifactId to parent url
                 return appendPath( parentUrl, artifactId.toString(), childPathAdjustment.toString() );
@@ -161,7 +162,7 @@ private String appendPath( String parentUrl, String childPath, String pathAdjust
 
         private void concatPath( StringBuilder url, String path )
         {
-            if ( url.length() > 0 && path.length() > 0 )
+            if ( path.length() > 0 )
             {
                 boolean initialUrlEndsWithSlash = url.charAt( url.length() - 1 ) == '/';
                 boolean pathStartsWithSlash = path.charAt( 0 ) ==  '/';

diff --git a/...der/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/...der/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
@@ -140,7 +140,7 @@ public void testFlatTrickyUrls()
     public void testWithEmptyUrl() 
         throws Exception
     {
-        	testInheritance( "empty", false );
+        	testInheritance( "empty-urls", false );
     }
 
     public void testInheritance( String baseName )

diff --git a/...esources/poms/inheritance/empty-child.xml → ...ces/poms/inheritance/empty-urls-child.xml b/...esources/poms/inheritance/empty-child.xml → ...ces/poms/inheritance/empty-urls-child.xml
diff --git a/...urces/poms/inheritance/empty-expected.xml → .../poms/inheritance/empty-urls-expected.xml b/...urces/poms/inheritance/empty-expected.xml → .../poms/inheritance/empty-urls-expected.xml
@@ -27,13 +27,18 @@ under the License.
     <artifactId>empty</artifactId>
     <version>1</version>
   </parent>
-  <groupId>inheritance</groupId>  
+  <groupId>inheritance</groupId>
   <artifactId>child</artifactId>
   <version>1</version>
   <url></url>
   <scm>
-    <connection>scm:my-scm:http://domain.org/base/child</connection>
-    <developerConnection>scm:my-scm:https://domain.org/base/child/</developerConnection>
+    <connection></connection>
+    <developerConnection></developerConnection>
     <url></url>
-  </scm>  
+  </scm>
+  <distributionManagement>
+    <site>
+      <url></url>
+    </site>
+  </distributionManagement>
 </project>
diff --git a/...sources/poms/inheritance/empty-parent.xml → ...es/poms/inheritance/empty-urls-parent.xml b/...sources/poms/inheritance/empty-parent.xml → ...es/poms/inheritance/empty-urls-parent.xml
@@ -30,8 +30,13 @@ under the License.
   </modules>
   <url></url>
   <scm>
-    <connection>scm:my-scm:http://domain.org/base</connection>
-    <developerConnection>scm:my-scm:https://domain.org/base/</developerConnection>
+    <connection> </connection>
+    <developerConnection>  </developerConnection>
     <url></url>
   </scm>
+  <distributionManagement>
+    <site>
+      <url></url>
+    </site>
+  </distributionManagement>
 </project>