[4/7] maven git commit: [MNG-5527] Relocation does not work for imported poms

2017-01-31 Thread schulte 
[MNG-5527] Relocation does not work for imported poms


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/04f4a7e5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/04f4a7e5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/04f4a7e5

Branch: refs/heads/DEPMGMT-IMPORT
Commit: 04f4a7e51af453051f61eaaeaec84c828f9aaa61
Parents: 626a7da
Author: Christian Schulte 
Authored: Tue Jun 21 21:35:40 2016 +0200
Committer: Christian Schulte 
Committed: Tue Jan 31 22:30:59 2017 +0100

--
 .../model/building/DefaultModelBuilder.java | 190 ---
 1 file changed, 125 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/04f4a7e5/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 3532660..5ca1623 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1114,8 +1114,6 @@ public class DefaultModelBuilder
 final WorkspaceModelResolver workspaceResolver = 
request.getWorkspaceModelResolver();
 final ModelResolver modelResolver = request.getModelResolver();
 
-ModelBuildingRequest importRequest = null;
-
 List importMngts = null;
 
 for ( Iterator it = depMngt.getDependencies().iterator(); 
it.hasNext(); )
@@ -1202,75 +1200,15 @@ public class DefaultModelBuilder
 }
 }
 
-// no workspace resolver or workspace resolver returned null 
(i.e. model not in workspace)
 if ( importModel == null )
 {
-final ModelSource importSource;
-try
-{
-dependency = dependency.clone();
-importSource = modelResolver.resolveModel( dependency 
);
-final String resolvedId =
-dependency.getGroupId() + ':' + 
dependency.getArtifactId() + ':' + dependency.getVersion();
+// no workspace resolver or workspace resolver returned 
null (i.e. model not in workspace)
+importModel = this.buildImportModelFromRepository( 
request, dependency, importIds, problems );
 
-if ( !imported.equals( resolvedId ) && 
importIds.contains( resolvedId ) )
-{
-// A version range has been resolved to a cycle.
-String message = "The dependencies of type=pom and 
with scope=import form a cycle: ";
-for ( String modelId : importIds )
-{
-message += modelId + " -> ";
-}
-message += resolvedId;
-problems.add( new ModelProblemCollectorRequest( 
Severity.ERROR, Version.BASE ).
-setMessage( message ) );
-
-continue;
-}
-}
-catch ( UnresolvableModelException e )
+if ( importModel == null )
 {
-StringBuilder buffer = new StringBuilder( 256 );
-buffer.append( "Non-resolvable import POM" );
-if ( !containsCoordinates( e.getMessage(), groupId, 
artifactId, version ) )
-{
-buffer.append( " " ).append( 
ModelProblemUtils.toId( groupId, artifactId, version ) );
-}
-buffer.append( ": " ).append( e.getMessage() );
-
-problems.add( new ModelProblemCollectorRequest( 
Severity.ERROR, Version.BASE )
-.setMessage( buffer.toString() ).setLocation( 
dependency.getLocation( "" ) )
-.setException( e ) );
 continue;
 }
-
-if ( importRequest == null )
-{
-importRequest = new DefaultModelBuildingRequest();
-importRequest.setValidationLevel( 
ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
-importRequest.setModelCache( request.getModelCache() );
-

[4/7] maven git commit: [MNG-5527] Relocation does not work for imported poms

2016-06-21 Thread schulte 
[MNG-5527] Relocation does not work for imported poms


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d3761d46
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d3761d46
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d3761d46

Branch: refs/heads/MNG-6006
Commit: d3761d46551e2eb8e29d476b4ae52fcf4ab3d4bc
Parents: c6fb60b
Author: Christian Schulte 
Authored: Tue Jun 21 21:35:40 2016 +0200
Committer: Christian Schulte 
Committed: Tue Jun 21 21:35:40 2016 +0200

--
 .../model/building/DefaultModelBuilder.java | 173 +++
 1 file changed, 105 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/d3761d46/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 5970dc4..87b6a96 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1275,8 +1275,6 @@ public class DefaultModelBuilder
 final WorkspaceModelResolver workspaceResolver = 
request.getWorkspaceModelResolver();
 final ModelResolver modelResolver = request.getModelResolver();
 
-ModelBuildingRequest importRequest = null;
-
 List importMngts = null;
 
 for ( Iterator it = 
depMngt.getDependencies().iterator(); it.hasNext(); )
@@ -1370,78 +1368,15 @@ public class DefaultModelBuilder
 }
 }
 
-// no workspace resolver or workspace resolver returned 
null (i.e. model not in workspace)
 if ( importModel == null )
 {
-final ModelSource importSource;
-try
-{
-dependency = dependency.clone();
-importSource = modelResolver.resolveModel( 
dependency );
-final String resolvedId =
-dependency.getGroupId() + ':' + 
dependency.getArtifactId() + ':'
-+ dependency.getVersion();
-
-if ( !imported.equals( resolvedId ) && 
importIds.contains( resolvedId ) )
-{
-// A version range has been resolved to a 
cycle.
-String message = "The dependencies of type=pom 
and scope=" + scope + " form a cycle: ";
-for ( String modelId : importIds )
-{
-message += modelId + " -> ";
-}
-message += resolvedId;
-problems.add( new 
ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).
-setMessage( message ) );
-
-continue;
-}
-}
-catch ( UnresolvableModelException e )
-{
-StringBuilder buffer = new StringBuilder( 256 );
-buffer.append( "Non-resolvable " + scope + " POM" 
);
-if ( !containsCoordinates( e.getMessage(), 
groupId, artifactId, version ) )
-{
-buffer.append( ' ' ).append( 
ModelProblemUtils.toId( groupId, artifactId, version ) );
-}
-buffer.append( ": " ).append( e.getMessage() );
-
-problems.add( new ModelProblemCollectorRequest( 
Severity.ERROR, Version.BASE ).
-setMessage( buffer.toString() ).
-setLocation( dependency.getLocation( "" ) ).
-setException( e ) );
-
-continue;
-}
+// no workspace resolver or workspace resolver 
returned null (i.e. model not in workspace)
+importModel = this.buildImportModelFromRepository( 
request, dependency, importIds, problems );
 
-if ( importRequest == null )
+if ( importModel == null )
 {
-importRequest =