[3/5] maven git commit: [MNG-5527] Dependency management import should support relocations.
[MNG-5527] Dependency management import should support relocations.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9465aa69
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9465aa69
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9465aa69
Branch: refs/heads/DEPMGMT-IMPORT
Commit: 9465aa6958646079906f126fad0a84986069ab72
Parents: c0b0b8b
Author: Christian Schulte
Authored: Tue Jun 21 21:35:40 2016 +0200
Committer: Christian Schulte
Committed: Wed Mar 8 18:34:33 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 191 ---
1 file changed, 126 insertions(+), 65 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/9465aa69/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 3699bd9..e3beb2c 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
@@ -1119,8 +1119,6 @@ public class DefaultModelBuilder
final WorkspaceModelResolver workspaceResolver =
request.getWorkspaceModelResolver();
final ModelResolver modelResolver = request.getModelResolver();
-ModelBuildingRequest importRequest = null;
-
List importMgmts = null;
for ( Iterator it = depMgmt.getDependencies().iterator();
it.hasNext(); )
@@ -1207,75 +1205,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
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 )
-{
-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() );
-importRequest.setSystemProperties(
request.getSystemProperties() );
-importRequest.setUserProperties(
request.getUserProperties() );
-importRequest.setLocationTracking(
request.isLocationTracking() );
-}
-
-importRequest.setModelSource( importSourc
[3/5] maven git commit: [MNG-5527] Dependency management import should support relocations.
[MNG-5527] Dependency management import should support relocations.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/95797415
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/95797415
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/95797415
Branch: refs/heads/DEPMGMT-IMPORT
Commit: 95797415d13dfd364df612716cfecf0c40c0d992
Parents: 758aad1
Author: Christian Schulte
Authored: Tue Jun 21 21:35:40 2016 +0200
Committer: Christian Schulte
Committed: Sun Feb 5 00:05:26 2017 +0100
--
.../model/building/DefaultModelBuilder.java | 190 ---
1 file changed, 125 insertions(+), 65 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/95797415/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 e07f8e9..b25d8f2 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
@@ -1119,8 +1119,6 @@ public class DefaultModelBuilder
final WorkspaceModelResolver workspaceResolver =
request.getWorkspaceModelResolver();
final ModelResolver modelResolver = request.getModelResolver();
-ModelBuildingRequest importRequest = null;
-
List importMgmts = null;
for ( Iterator it = depMgmt.getDependencies().iterator();
it.hasNext(); )
@@ -1207,75 +1205,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() );
-importRequest.setSystemProperties(
request.getSystemProperti
