[1/3] maven git commit: [MNG-6182] ModelResolver interface enhancements. [Forced Update!]

[khmarbaise]

Repository: maven
Updated Branches:
  refs/heads/MNG-6057 fd4f1efa0 -> bb722723e (forced update)


[MNG-6182] ModelResolver interface enhancements.


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

Branch: refs/heads/MNG-6057
Commit: ab800b0cfae4e3ca9453304e3b9727ba4a4b712b
Parents: 114ef6c
Author: Christian Schulte 
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte 
Committed: Wed Mar 8 18:24:18 2017 +0100

--
 .../maven/project/ProjectModelResolver.java | 84 +++
 .../maven/model/resolution/ModelResolver.java   | 32 
 .../internal/DefaultModelResolver.java  | 85 
 3 files changed, 167 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ab800b0c/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java 
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 7b93217..3a31d33 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -28,7 +28,7 @@ import java.util.Set;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
-
+import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.building.FileModelSource;
@@ -203,24 +203,26 @@ public class ProjectModelResolver
 return new FileModelSource( pomFile );
 }
 
-public ModelSource resolveModel( Parent parent )
+@Override
+public ModelSource resolveModel( final Parent parent )
 throws UnresolvableModelException
 {
-Artifact artifact = new DefaultArtifact( parent.getGroupId(), 
parent.getArtifactId(), "", "pom",
- parent.getVersion() );
-
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest( 
artifact, repositories, context );
-versionRangeRequest.setTrace( trace );
-
 try
 {
-VersionRangeResult versionRangeResult = 
resolver.resolveVersionRange( session, versionRangeRequest );
+final Artifact artifact = new DefaultArtifact( 
parent.getGroupId(), parent.getArtifactId(), "", "pom",
+   parent.getVersion() 
);
+
+final VersionRangeRequest versionRangeRequest = new 
VersionRangeRequest( artifact, repositories, context );
+versionRangeRequest.setTrace( trace );
+
+final VersionRangeResult versionRangeResult = 
resolver.resolveVersionRange( session, versionRangeRequest );
 
 if ( versionRangeResult.getHighestVersion() == null )
 {
-throw new UnresolvableModelException( "No versions matched the 
requested range '" + parent.getVersion()
-  + "'", 
parent.getGroupId(), parent.getArtifactId(),
-  parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "No versions matched the requested parent 
version range '%s'",
+   parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(), 
parent.getVersion() );
 
 }
 
@@ -229,21 +231,69 @@ public class ProjectModelResolver
  && 
versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
 {
 // Message below is checked for in the MNG-2199 core IT.
-throw new UnresolvableModelException( "The requested version 
range '" + parent.getVersion()
-  + "' does not 
specify an upper bound", parent.getGroupId(),
-  parent.getArtifactId(), 
parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "The requested parent version range '%s' 
does not specify an upper bound",
+   parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(), 
parent.getVersion() );
 
 }
 
 parent.setVersion( 
versionRangeResult.getHighestVersion().toString() );
+
+return 

[1/3] maven git commit: [MNG-6182] ModelResolver interface enhancements. [Forced Update!]

[schulte]

Repository: maven
Updated Branches:
  refs/heads/MNG-6164 a8d5f3bed -> c013c0ee6 (forced update)


[MNG-6182] ModelResolver interface enhancements.


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

Branch: refs/heads/MNG-6164
Commit: ab800b0cfae4e3ca9453304e3b9727ba4a4b712b
Parents: 114ef6c
Author: Christian Schulte 
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte 
Committed: Wed Mar 8 18:24:18 2017 +0100

--
 .../maven/project/ProjectModelResolver.java | 84 +++
 .../maven/model/resolution/ModelResolver.java   | 32 
 .../internal/DefaultModelResolver.java  | 85 
 3 files changed, 167 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ab800b0c/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java 
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 7b93217..3a31d33 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -28,7 +28,7 @@ import java.util.Set;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
-
+import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.building.FileModelSource;
@@ -203,24 +203,26 @@ public class ProjectModelResolver
 return new FileModelSource( pomFile );
 }
 
-public ModelSource resolveModel( Parent parent )
+@Override
+public ModelSource resolveModel( final Parent parent )
 throws UnresolvableModelException
 {
-Artifact artifact = new DefaultArtifact( parent.getGroupId(), 
parent.getArtifactId(), "", "pom",
- parent.getVersion() );
-
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest( 
artifact, repositories, context );
-versionRangeRequest.setTrace( trace );
-
 try
 {
-VersionRangeResult versionRangeResult = 
resolver.resolveVersionRange( session, versionRangeRequest );
+final Artifact artifact = new DefaultArtifact( 
parent.getGroupId(), parent.getArtifactId(), "", "pom",
+   parent.getVersion() 
);
+
+final VersionRangeRequest versionRangeRequest = new 
VersionRangeRequest( artifact, repositories, context );
+versionRangeRequest.setTrace( trace );
+
+final VersionRangeResult versionRangeResult = 
resolver.resolveVersionRange( session, versionRangeRequest );
 
 if ( versionRangeResult.getHighestVersion() == null )
 {
-throw new UnresolvableModelException( "No versions matched the 
requested range '" + parent.getVersion()
-  + "'", 
parent.getGroupId(), parent.getArtifactId(),
-  parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "No versions matched the requested parent 
version range '%s'",
+   parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(), 
parent.getVersion() );
 
 }
 
@@ -229,21 +231,69 @@ public class ProjectModelResolver
  && 
versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
 {
 // Message below is checked for in the MNG-2199 core IT.
-throw new UnresolvableModelException( "The requested version 
range '" + parent.getVersion()
-  + "' does not 
specify an upper bound", parent.getGroupId(),
-  parent.getArtifactId(), 
parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "The requested parent version range '%s' 
does not specify an upper bound",
+   parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(), 
parent.getVersion() );
 
 }
 
 parent.setVersion( 
versionRangeResult.getHighestVersion().toString() );
+
+return 

[1/3] maven git commit: [MNG-6182] ModelResolver interface enhancements. [Forced Update!]

[schulte]

Repository: maven
Updated Branches:
  refs/heads/MNG-6114 85cd59bf8 -> 6d17c0796 (forced update)


[MNG-6182] ModelResolver interface enhancements.


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

Branch: refs/heads/MNG-6114
Commit: ab800b0cfae4e3ca9453304e3b9727ba4a4b712b
Parents: 114ef6c
Author: Christian Schulte 
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte 
Committed: Wed Mar 8 18:24:18 2017 +0100

--
 .../maven/project/ProjectModelResolver.java | 84 +++
 .../maven/model/resolution/ModelResolver.java   | 32 
 .../internal/DefaultModelResolver.java  | 85 
 3 files changed, 167 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ab800b0c/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java 
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index 7b93217..3a31d33 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -28,7 +28,7 @@ import java.util.Set;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
-
+import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.building.FileModelSource;
@@ -203,24 +203,26 @@ public class ProjectModelResolver
 return new FileModelSource( pomFile );
 }
 
-public ModelSource resolveModel( Parent parent )
+@Override
+public ModelSource resolveModel( final Parent parent )
 throws UnresolvableModelException
 {
-Artifact artifact = new DefaultArtifact( parent.getGroupId(), 
parent.getArtifactId(), "", "pom",
- parent.getVersion() );
-
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest( 
artifact, repositories, context );
-versionRangeRequest.setTrace( trace );
-
 try
 {
-VersionRangeResult versionRangeResult = 
resolver.resolveVersionRange( session, versionRangeRequest );
+final Artifact artifact = new DefaultArtifact( 
parent.getGroupId(), parent.getArtifactId(), "", "pom",
+   parent.getVersion() 
);
+
+final VersionRangeRequest versionRangeRequest = new 
VersionRangeRequest( artifact, repositories, context );
+versionRangeRequest.setTrace( trace );
+
+final VersionRangeResult versionRangeResult = 
resolver.resolveVersionRange( session, versionRangeRequest );
 
 if ( versionRangeResult.getHighestVersion() == null )
 {
-throw new UnresolvableModelException( "No versions matched the 
requested range '" + parent.getVersion()
-  + "'", 
parent.getGroupId(), parent.getArtifactId(),
-  parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "No versions matched the requested parent 
version range '%s'",
+   parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(), 
parent.getVersion() );
 
 }
 
@@ -229,21 +231,69 @@ public class ProjectModelResolver
  && 
versionRangeResult.getVersionConstraint().getRange().getUpperBound() == null )
 {
 // Message below is checked for in the MNG-2199 core IT.
-throw new UnresolvableModelException( "The requested version 
range '" + parent.getVersion()
-  + "' does not 
specify an upper bound", parent.getGroupId(),
-  parent.getArtifactId(), 
parent.getVersion() );
+throw new UnresolvableModelException(
+String.format( "The requested parent version range '%s' 
does not specify an upper bound",
+   parent.getVersion() ),
+parent.getGroupId(), parent.getArtifactId(), 
parent.getVersion() );
 
 }
 
 parent.setVersion( 
versionRangeResult.getHighestVersion().toString() );
+
+return