[05/16] maven git commit: o Updated to 3.5.1-SNAPSHOT to make the ITs run.

2017-02-10 Thread schulte 
o Updated to 3.5.1-SNAPSHOT to make the ITs run.


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

Branch: refs/heads/DEPMGMT-IT
Commit: 2f892cba516290dec0fe21579dce92924d91faf5
Parents: c134495
Author: Christian Schulte 
Authored: Tue Jan 31 03:17:58 2017 +0100
Committer: Christian Schulte 
Committed: Fri Feb 10 22:50:55 2017 +0100

--
 apache-maven/pom.xml  | 2 +-
 maven-artifact/pom.xml| 2 +-
 maven-builder-support/pom.xml | 2 +-
 maven-compat/pom.xml  | 2 +-
 maven-core/pom.xml| 2 +-
 maven-embedder/pom.xml| 2 +-
 maven-model-builder/pom.xml   | 2 +-
 maven-model/pom.xml   | 2 +-
 maven-plugin-api/pom.xml  | 2 +-
 maven-repository-metadata/pom.xml | 2 +-
 maven-resolver-provider/pom.xml   | 2 +-
 maven-settings-builder/pom.xml| 2 +-
 maven-settings/pom.xml| 2 +-
 maven-slf4j-provider/pom.xml  | 2 +-
 pom.xml   | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/2f892cba/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 6fc5a73..d313f80 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   apache-maven

http://git-wip-us.apache.org/repos/asf/maven/blob/2f892cba/maven-artifact/pom.xml
--
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index e3943c9..b13482b 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-artifact

http://git-wip-us.apache.org/repos/asf/maven/blob/2f892cba/maven-builder-support/pom.xml
--
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 39eb161..5eb7903 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-builder-support

http://git-wip-us.apache.org/repos/asf/maven/blob/2f892cba/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 2b205f7..b06d3f3 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-compat

http://git-wip-us.apache.org/repos/asf/maven/blob/2f892cba/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 95162bd..b10b329 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-core

http://git-wip-us.apache.org/repos/asf/maven/blob/2f892cba/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 30ad2ce..66e09a3 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-embedder

http://git-wip-us.apache.org/repos/asf/maven/blob/2f892cba/maven-model-builder/pom.xml
--
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index fbfd417..7cef99b 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-model-builder

http://git-wip-us.apache.org/repos/asf/maven/blob/2f892cba/maven-model/pom.xml
--
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 41cf168..aabb25d 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-model

[07/10] maven git commit: [MNG-5971] Imported dependencies should be available to inheritance processing

2017-02-10 Thread schulte 
[MNG-5971] Imported dependencies should be available to inheritance processing

o Updated the 'DefaultDependencyManagementImporter' to stop ignoring import
  dependency conflicts silently. Such conflicts need to be resolved manually by
  adding the conflicting dependency to the pom manually.
o Updated to add support for an 'include' scope in dependency management
  processed before inheritance and interpolation.
o Re-formatted 'DefaultModelBuilder'.
o Documentation updates.


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

Branch: refs/heads/DEPMGMT-INCLUDE-IT
Commit: e19c42bf8c5cd62a2e571a7039a180da9fef53ed
Parents: 98e3e36
Author: Christian Schulte 
Authored: Thu Feb 18 14:07:02 2016 +0100
Committer: Christian Schulte 
Committed: Fri Feb 10 22:51:31 2017 +0100

--
 .../model/building/DefaultModelBuilder.java | 384 ++-
 .../building/DefaultModelBuildingResult.java|  26 +-
 .../model/building/ModelBuildingResult.java |  12 +
 .../DefaultDependencyManagementImporter.java| 213 +-
 maven-model-builder/src/site/apt/index.apt  |   8 +-
 5 files changed, 523 insertions(+), 120 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/e19c42bf/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 0047c53..964b117 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
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -82,6 +83,7 @@ import static 
org.apache.maven.model.building.Result.newResult;
 public class DefaultModelBuilder
 implements ModelBuilder
 {
+
 @Requirement
 private ModelProcessor modelProcessor;
 
@@ -248,8 +250,8 @@ public class DefaultModelBuilder
 DefaultProfileActivationContext profileActivationContext = 
getProfileActivationContext( request );
 
 problems.setSource( "(external profiles)" );
-List activeExternalProfiles = 
profileSelector.getActiveProfiles( request.getProfiles(),
-   
   profileActivationContext, problems );
+List activeExternalProfiles =
+profileSelector.getActiveProfiles( request.getProfiles(), 
profileActivationContext, problems );
 
 result.setActiveExternalProfiles( activeExternalProfiles );
 
@@ -296,8 +298,9 @@ public class DefaultModelBuilder
 
 profileActivationContext.setProjectProperties( 
tmpModel.getProperties() );
 
-List activePomProfiles = 
profileSelector.getActiveProfiles( rawModel.getProfiles(),
-   
  profileActivationContext, problems );
+List activePomProfiles =
+profileSelector.getActiveProfiles( rawModel.getProfiles(), 
profileActivationContext, problems );
+
 currentData.setActiveProfiles( activePomProfiles );
 
 Map interpolatedActivations = 
getProfileActivations( rawModel, false );
@@ -332,13 +335,13 @@ public class DefaultModelBuilder
 }
 else if ( currentData == resultData )
 { // First iteration - add initial id after version resolution.
-currentData.setGroupId( currentData.getRawModel().getGroupId() 
== null ? parentData.getGroupId()
-   
   : currentData.getRawModel()
-   
   .getGroupId() );
+currentData.setGroupId( currentData.getRawModel().getGroupId() 
== null
+? parentData.getGroupId()
+: 
currentData.getRawModel().getGroupId() );
 
-currentData.setVersion( currentData.getRawModel().getVersion() 
== null ? parentData.getVersion()
-   
   :

[05/15] maven git commit: [MNG-5527] Dependency management import should support relocations.

2017-02-10 Thread schulte 
[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/183c2047
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/183c2047
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/183c2047

Branch: refs/heads/DEPMGMT
Commit: 183c2047cd26c6276acaccdccc64841f897cea84
Parents: 82bd000
Author: Christian Schulte 
Authored: Tue Jun 21 21:35:40 2016 +0200
Committer: Christian Schulte 
Committed: Fri Feb 10 22:50:55 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/183c2047/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..5fa52a6 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() );
-}
-
-

[10/15] maven git commit: [MNG-1577] dependencyManagement does not work for transitive dependencies

2017-02-10 Thread schulte 
[MNG-1577] dependencyManagement does not work for transitive dependencies

o Updated to correct an incorrect test case.


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

Branch: refs/heads/DEPMGMT
Commit: 68be1836a90cbfad30288af1420f17bb54ab7cc3
Parents: ed34aa2
Author: Christian Schulte 
Authored: Wed Feb 3 19:17:02 2016 +0100
Committer: Christian Schulte 
Committed: Fri Feb 10 22:51:59 2017 +0100

--
 maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml | 2 --
 maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml| 2 --
 2 files changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/68be1836/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml
--
diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml 
b/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml
index 4686219..2ac9544 100644
--- a/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml
+++ b/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml
@@ -24,8 +24,6 @@
 maven-test
 t06-d
 1.0
-test
-false
   
 
   

http://git-wip-us.apache.org/repos/asf/maven/blob/68be1836/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml
--
diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml 
b/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml
index 60c540c..6a66cd1 100644
--- a/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml
+++ b/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml
@@ -29,8 +29,6 @@
 maven-test
 t06-d
 1.2
-test
-false

[08/15] maven git commit: [MNG-4347] import-scoped dependencies of direct dependencies are not resolved using profile modifications from settings.xml

2017-02-10 Thread schulte 
[MNG-4347] import-scoped dependencies of direct dependencies are not resolved 
using profile modifications from settings.xml

o Updated the 'DefaultModelResolver' to handle replacing repositories the same 
way the
  'DefaultDependencyCollector' does. When the 'DefaultDependencyCollector' finds
  a repository in a child node with an id matching a repository already in use,
  it will only merge any mirror definitions but never change the repository 
already
  in use. The 'DefaultModelResolver' needs to follow the same logic. What has 
been
  provided must not change for consistency.


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

Branch: refs/heads/DEPMGMT
Commit: 08a11361dbc849c59fd1e9d18e146f79b2e4e69d
Parents: 2f892cb
Author: Christian Schulte 
Authored: Tue Dec 13 03:30:32 2016 +0100
Committer: Christian Schulte 
Committed: Fri Feb 10 22:51:31 2017 +0100

--
 .../maven/repository/internal/DefaultModelResolver.java | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/08a11361/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
--
diff --git 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index 260a770..0cc5b17 100644
--- 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++ 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -71,6 +71,8 @@ class DefaultModelResolver
 
 private final List externalRepositories;
 
+private final Set externalRepositoryIds;
+
 private final ArtifactResolver resolver;
 
 private final VersionRangeResolver versionRangeResolver;
@@ -93,8 +95,13 @@ class DefaultModelResolver
 List externalRepositories = new ArrayList<>();
 externalRepositories.addAll( repositories );
 this.externalRepositories = Collections.unmodifiableList( 
externalRepositories );
-
 this.repositoryIds = new HashSet<>();
+this.externalRepositoryIds = new HashSet<>();
+for ( final RemoteRepository repository : this.repositories )
+{
+this.repositoryIds.add( repository.getId() );
+this.externalRepositoryIds.add( repository.getId() );
+}
 }
 
 private DefaultModelResolver( DefaultModelResolver original )
@@ -108,6 +115,7 @@ class DefaultModelResolver
 this.repositories = new ArrayList<>( original.repositories );
 this.externalRepositories = original.externalRepositories;
 this.repositoryIds = new HashSet<>( original.repositoryIds );
+this.externalRepositoryIds = new HashSet<>( 
original.externalRepositoryIds );
 }
 
 @Override
@@ -128,7 +136,7 @@ class DefaultModelResolver
 
 if ( !repositoryIds.add( repository.getId() ) )
 {
-if ( !replace )
+if ( !replace || this.externalRepositoryIds.contains( 
repository.getId() ) )
 {
 return;
 }

[04/15] maven git commit: [MNG-4463] Dependency management import should support version ranges.

2017-02-10 Thread schulte 
[MNG-4463] Dependency management import should support version ranges.

o Extended the 'ModelResolver' interface to support resolving 'Dependency's
  in addition to 'Parent's.

Closes #64 without merging. ITs are pending to be committed.


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

Branch: refs/heads/DEPMGMT
Commit: 82bd000484b337f85eb792073fe0ba52e5f31231
Parents: 0514c1b
Author: Christian Schulte 
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte 
Committed: Fri Feb 10 22:50:55 2017 +0100

--
 .../maven/project/ProjectModelResolver.java | 83 +++
 .../model/building/DefaultModelBuilder.java | 20 -
 .../maven/model/resolution/ModelResolver.java   | 32 
 .../internal/DefaultModelResolver.java  | 85 
 4 files changed, 186 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/82bd0004/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..e5aa052 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
@@ -26,6 +26,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.maven.model.Dependency;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
@@ -203,24 +204,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 +232,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(

[9/9] maven git commit: [MNG-4347] import-scoped dependencies of direct dependencies are not resolved using profile modifications from settings.xml

2017-02-10 Thread schulte 
[MNG-4347] import-scoped dependencies of direct dependencies are not resolved 
using profile modifications from settings.xml

o Updated the 'DefaultModelResolver' to handle replacing repositories the same 
way the
  'DefaultDependencyCollector' does. When the 'DefaultDependencyCollector' finds
  a repository in a child node with an id matching a repository already in use,
  it will only merge any mirror definitions but never change the repository 
already
  in use. The 'DefaultModelResolver' needs to follow the same logic. What has 
been
  provided must not change for consistency.


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

Branch: refs/heads/DEPMGMT-INCLUDE
Commit: 08a11361dbc849c59fd1e9d18e146f79b2e4e69d
Parents: 2f892cb
Author: Christian Schulte 
Authored: Tue Dec 13 03:30:32 2016 +0100
Committer: Christian Schulte 
Committed: Fri Feb 10 22:51:31 2017 +0100

--
 .../maven/repository/internal/DefaultModelResolver.java | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/08a11361/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
--
diff --git 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index 260a770..0cc5b17 100644
--- 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++ 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -71,6 +71,8 @@ class DefaultModelResolver
 
 private final List externalRepositories;
 
+private final Set externalRepositoryIds;
+
 private final ArtifactResolver resolver;
 
 private final VersionRangeResolver versionRangeResolver;
@@ -93,8 +95,13 @@ class DefaultModelResolver
 List externalRepositories = new ArrayList<>();
 externalRepositories.addAll( repositories );
 this.externalRepositories = Collections.unmodifiableList( 
externalRepositories );
-
 this.repositoryIds = new HashSet<>();
+this.externalRepositoryIds = new HashSet<>();
+for ( final RemoteRepository repository : this.repositories )
+{
+this.repositoryIds.add( repository.getId() );
+this.externalRepositoryIds.add( repository.getId() );
+}
 }
 
 private DefaultModelResolver( DefaultModelResolver original )
@@ -108,6 +115,7 @@ class DefaultModelResolver
 this.repositories = new ArrayList<>( original.repositories );
 this.externalRepositories = original.externalRepositories;
 this.repositoryIds = new HashSet<>( original.repositoryIds );
+this.externalRepositoryIds = new HashSet<>( 
original.externalRepositoryIds );
 }
 
 @Override
@@ -128,7 +136,7 @@ class DefaultModelResolver
 
 if ( !repositoryIds.add( repository.getId() ) )
 {
-if ( !replace )
+if ( !replace || this.externalRepositoryIds.contains( 
repository.getId() ) )
 {
 return;
 }

[2/5] maven git commit: [MNG-5527] Dependency management import should support relocations.

2017-02-10 Thread schulte 
[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/183c2047
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/183c2047
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/183c2047

Branch: refs/heads/DEPMGMT-IMPORT
Commit: 183c2047cd26c6276acaccdccc64841f897cea84
Parents: 82bd000
Author: Christian Schulte 
Authored: Tue Jun 21 21:35:40 2016 +0200
Committer: Christian Schulte 
Committed: Fri Feb 10 22:50:55 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/183c2047/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..5fa52a6 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() );
-}
-
-

maven git commit: [MNG-2199] Support version ranges in parent elements [Forced Update!]

2017-02-10 Thread schulte 
Repository: maven
Updated Branches:
  refs/heads/MNG-2199 283611829 -> 0514c1b14 (forced update)


[MNG-2199] Support version ranges in parent elements

o Updated to fix parent version range resolution broken since 3.2.3 and to
  remove parent version range resolution logic obsolete since Maven
  3.2.3 which changed the initialization of MavenProject instances.
o Updated local parent resolution to behave the same way remote parent
  resolution behaves. When referencing a parent using version ranges,
  inheriting the version or using version expressions should not be supported.
  It has been implemented that way for remote parent resolution as it got
  introduced in Maven 3.2.2. For local parent resolution the version in parent
  declarations had been ignored completely as of Maven 3.3.0 due to commit
  be3fb200326208ca4b8c41ebf16d5ae6b8049792 removing all local parent version
  validation. Work on fixing this is tracked by MNG-5840 released with Maven
  3.3.9. This commit adds the final missing bits to make local and remote parent
  resolution behave the same way as much as possible. As an exception, remote
  parent resolution still is a bit more strict than local parent resolution due
  to a different API in use. When resolving a parent from a repository using
  version ranges, the ModelBuilder verifies the range in use to declare an upper
  bound. When resolving a parent locally using version ranges, those ranges are
  not required to declare an upper bound because the API in use does not support
  querying that. Authoring a POM relying on this difference should be considered
  a bug.
o Added test cases to maven-core testing parent version range resolution for
  local and remote parent models.


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

Branch: refs/heads/MNG-2199
Commit: 0514c1b14eadae37c9de77af3ed67ed7388bdf1d
Parents: f4e07ac
Author: Christian Schulte 
Authored: Sat Dec 12 20:28:56 2015 +0100
Committer: Christian Schulte 
Committed: Fri Feb 10 22:46:52 2017 +0100

--
 .../maven/project/DefaultProjectBuilder.java| 115 +---
 .../project/DefaultProjectBuildingRequest.java  |  15 ++-
 .../maven/project/ProjectBuildingRequest.java   |  14 +-
 .../maven/project/ProjectModelResolver.java |   1 +
 .../project/AbstractMavenProjectTestCase.java   |  11 ++
 .../project/DefaultMavenProjectBuilderTest.java | 130 +++
 .../repository/TestRepositoryConnector.java |  38 ++
 .../org/apache/apache/1/apache-1.pom|  82 
 .../org/apache/apache/maven-metadata.xml|  13 ++
 .../pom.xml |  12 ++
 .../pom.xml |  11 ++
 .../parent-version-range-external-valid/pom.xml |  11 ++
 .../child/pom.xml   |  12 ++
 .../pom.xml |   7 +
 .../child/pom.xml   |  11 ++
 .../pom.xml |   7 +
 .../child/pom.xml   |  11 ++
 .../parent-version-range-local-valid/pom.xml|   7 +
 .../model/building/DefaultModelBuilder.java |  30 -
 .../internal/DefaultModelResolver.java  |   1 +
 20 files changed, 484 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/0514c1b1/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index d064ab4..ac38f5d 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -43,7 +43,6 @@ import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.DeploymentRepository;
 import org.apache.maven.model.Extension;
 import org.apache.maven.model.Model;
-import org.apache.maven.model.Parent;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.ReportPlugin;
@@ -73,9 +72,6 @@ import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.repository.WorkspaceRepository;
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResult;
-import org.eclipse.aether.resolution.VersionRangeRequest;
-import org.eclipse.aether.resolution.VersionRangeResolutionException;
-import

svn commit: r1782495 - in /maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies: pom.xml verify.groovy

2017-02-10 Thread gboue 
Author: gboue
Date: Fri Feb 10 18:31:28 2017
New Revision: 1782495

URL: http://svn.apache.org/viewvc?rev=1782495=rev
Log:
[MSHARED-616] Dependencies inside pluginManagement are not taken into account 
in reporting

Fixing the tests so that they run with Java **6**, 7 and 8...

Modified:

maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/pom.xml

maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/verify.groovy

Modified: 
maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/pom.xml?rev=1782495=1782494=1782495=diff
==
--- 
maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/pom.xml
 (original)
+++ 
maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/pom.xml
 Fri Feb 10 18:31:28 2017
@@ -32,12 +32,12 @@ under the License.
   
 
   maven-checkstyle-plugin
-  2.17
+  2.10
   
 
   com.puppycrawl.tools
   checkstyle
-  6.18
+  5.8
 
   
 

Modified: 
maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/verify.groovy?rev=1782495=1782494=1782495=diff
==
--- 
maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/verify.groovy
 (original)
+++ 
maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/verify.groovy
 Fri Feb 10 18:31:28 2017
@@ -20,7 +20,7 @@
 
 content = new File( basedir, 'build.log' ).text;
 
-assert !content.contains( 'com.puppycrawl.tools:checkstyle:jar:6.11.2' );
-assert content.contains( 'com.puppycrawl.tools:checkstyle:jar:6.18' );
+assert !content.contains( 'com.puppycrawl.tools:checkstyle:jar:5.6' );
+assert content.contains( 'com.puppycrawl.tools:checkstyle:jar:5.8' );
 
 return true;
\ No newline at end of file

[01/12] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements [Forced Update!]

2017-02-10 Thread schulte 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/DEPMGMT 3af028d2c -> b269329c1 (forced update)


[MNG-2199] Support version ranges in parent elements

o Updated the ITs to correctly detect parent resolution failures. Maven does
  not fail the build when it cannot resolve a parent but instead logs a
  warning message. The ITs never checked the log to contain the warning messages
  but instead asserted the build to fail when a parent cannot be resolved.
  The only Maven version supporting parent version ranges is Maven 3.2.2 due to
  this.
o Removed an incorrect test case for local parent resolution. Maven ignored
  the '' in '' elements for local parent resolution. The core
  has been updated across various versions to eliminate any differences between
  local and remote parent resolution. When local parent resolution had been
  updated to match remote parent resolution, an existing IT started to fail
  testing incorrect behaviour. As soon as the '' is referenced using a
  version range, the '' element in the project becomes mandatory and
  does no longer support using an expression any more. This has been that way
  for remote parent resolution from day one. It has never been supported to
  inherit a version from a parent when referencing that parent using a version
  range intentionally.
o Updated to account for updated error messages.


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

Branch: refs/heads/DEPMGMT
Commit: 80438a6b97389225db0d97aa0ef9bf8ec7b5d2e6
Parents: f6ad650
Author: Christian Schulte 
Authored: Sat Dec 12 19:25:15 2015 +0100
Committer: Christian Schulte 
Committed: Fri Feb 10 18:46:55 2017 +0100

--
 .../MavenITmng2199ParentVersionRangeTest.java   | 226 ---
 .../expression-local/child/pom.xml  |  12 +
 .../expression-local/pom.xml|  10 +
 .../inherited-local/child/pom.xml   |  11 +
 .../inherited-local/pom.xml |  10 +
 .../invalid-local/child/pom.xml |  12 +
 .../invalid-local/pom.xml   |  10 +
 .../local-fallback-to-remote/child/pom.xml  |  18 ++
 .../local-fallback-to-remote/pom.xml|   8 +
 .../local-parent/module/pom.xml |  13 --
 .../local-parent/pom.xml|  16 --
 .../valid-local/child/pom.xml   |  11 +
 .../valid-local/pom.xml |  10 +
 13 files changed, 311 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/80438a6b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
index 16ac91c..4f1b3aa 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
@@ -32,8 +32,11 @@ public class MavenITmng2199ParentVersionRangeTest
 public void testValidParentVersionRangeWithInclusiveUpperBound()
 throws Exception
 {
+failingMavenVersions( "(3.2.2,3.5.0)" );
 Verifier verifier = null;
-File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/mng-2199-parent-version-range/valid-inclusive-upper-bound" );
+File testDir =
+ResourceExtractor.simpleExtractResources( getClass(),
+  
"/mng-2199-parent-version-range/valid-inclusive-upper-bound" );
 
 try
 {
@@ -43,18 +46,31 @@ public class MavenITmng2199ParentVersionRangeTest
 
 verifier.executeGoal( "verify" );
 verifier.verifyErrorFreeLog();
+
+// All Maven versions not supporting remote parent version ranges 
will log a warning message whenever
+// building a parent fails. The build succeeds without any parent. 
If that warning message appears in the
+// log, parent resolution failed.
+final List lines = verifier.loadFile( new File( testDir, 
"log.txt" ), false );
+assertFalse( "Unxpected error message found.",
+ indexOf( lines, ".*Failed to build parent project.*" 
) >= 0 );
+
 }
 finally
 {
-

[3/4] maven-integration-testing git commit: [MNG-5600] Dependency management import should support exclusions.

2017-02-10 Thread schulte 
[MNG-5600] Dependency management import should support exclusions.


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

Branch: refs/heads/DEPMGMT-IMPORT
Commit: 14da29b046a0f0e8df22103c1869a7fdc140cfeb
Parents: c7b190a
Author: Christian Schulte 
Authored: Sun Jun 19 17:18:51 2016 +0200
Committer: Christian Schulte 
Committed: Fri Feb 10 18:48:20 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   |  1 +
 ...ependencyManagementImportExclusionsTest.java | 82 +++
 .../test/resources/mng-5600/exclusions/pom.xml  | 84 
 .../apache/maven/its/mng5600/bom/0/bom-0.pom| 44 ++
 .../resources/mng-5600/settings-template.xml| 43 ++
 5 files changed, 254 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/14da29b0/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java 
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 1e741c4..25b8906 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -106,6 +106,7 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( 
MavenITmng5600DependencyManagementImportExclusionsTest.class );
 suite.addTestSuite( 
MavenITmng5527DependencyManagementImportRelocationsTest.class );
 suite.addTestSuite( 
MavenITmng4463DependencyManagementImportVersionRanges.class );
 suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/14da29b0/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java
new file mode 100644
index 000..fc2ef63
--- /dev/null
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5600DependencyManagementImportExclusionsTest.java
@@ -0,0 +1,82 @@
+package org.apache.maven.it;
+
+/*
+ * 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.
+ */
+import java.io.File;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+import static junit.framework.Assert.assertEquals;
+
+/**
+ * [MNG-5600] Dependency management import should support exclusions.
+ *
+ * @author Christian Schulte
+ */
+public class MavenITmng5600DependencyManagementImportExclusionsTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng5600DependencyManagementImportExclusionsTest()
+{
+super( "[3.5.1,)" );
+}
+
+public void testCanExcludeDependenciesFromImport()
+throws Exception
+{
+final File testDir = ResourceExtractor.simpleExtractResources( 
getClass(), "/mng-5600/exclusions" );
+
+final Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+verifier.setAutoclean( false );
+verifier.filterFile( "../settings-template.xml", "settings.xml", 
"UTF-8",
+ (Map) verifier.newDefaultFilterProperties() );
+
+

[03/20] maven git commit: [MNG-6166] mvn dependency:go-offline fails due to missing transitive dependency jdom:jdom:jar:1.1

2017-02-10 Thread schulte 
[MNG-6166] mvn dependency:go-offline fails due to missing transitive dependency 
jdom:jdom:jar:1.1


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

Branch: refs/heads/DEPMGMT-IT
Commit: 66a0fbe495f7df45562bee22188341899e1ca839
Parents: 1be7ea8
Author: Archimedes Trajano 
Authored: Sat Feb 4 00:41:58 2017 +0100
Committer: Michael Osipov 
Committed: Mon Feb 6 20:36:39 2017 +0100

--
 maven-core/src/test/resources-project-builder/foo/sub/pom.xml | 4 
 pom.xml   | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/66a0fbe4/maven-core/src/test/resources-project-builder/foo/sub/pom.xml
--
diff --git a/maven-core/src/test/resources-project-builder/foo/sub/pom.xml 
b/maven-core/src/test/resources-project-builder/foo/sub/pom.xml
index c5e3d9a..dc10bd1 100644
--- a/maven-core/src/test/resources-project-builder/foo/sub/pom.xml
+++ b/maven-core/src/test/resources-project-builder/foo/sub/pom.xml
@@ -25,10 +25,6 @@
   dom4j
 
 
-  jdom
-  jdom
-
-
   org.apache.maven
   maven-model
 

http://git-wip-us.apache.org/repos/asf/maven/blob/66a0fbe4/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 75bdb87..83b7b18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@ under the License.
 1.2
 3.4
 4.11
-1.6
+1.7.1
 1.21
 3.0.22

[09/13] maven git commit: [MNG-4463] Dependency management import should support version ranges.

2017-02-10 Thread schulte 
[MNG-4463] Dependency management import should support version ranges.

o Extended the 'ModelResolver' interface to support resolving 'Dependency's
  in addition to 'Parent's.

Closes #64 without merging. ITs are pending to be committed.


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

Branch: refs/heads/DEPMGMT-INCLUDE
Commit: c29f43f56a1498456696813fecc2d1138379195c
Parents: 2836118
Author: Christian Schulte 
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte 
Committed: Fri Feb 10 18:40:52 2017 +0100

--
 .../maven/project/ProjectModelResolver.java | 83 +++
 .../model/building/DefaultModelBuilder.java | 20 -
 .../maven/model/resolution/ModelResolver.java   | 32 
 .../internal/DefaultModelResolver.java  | 85 
 4 files changed, 186 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/c29f43f5/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..e5aa052 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
@@ -26,6 +26,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.maven.model.Dependency;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
@@ -203,24 +204,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 +232,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(

[4/9] maven git commit: Squashed commit of the following:

2017-02-10 Thread schulte 
Squashed commit of the following:

commit f3f981022f9157e9d74a9d9dfef7ae102c4d0593
Author: rfscholte 
Date:   Thu Feb 9 11:00:17 2017 +0100

[MNG-6109] PluginDescriptor doesn't read since value of parameter
There's no specific IT, just a unittest, so itBranch should stay on master

commit 862e8e4e3a2b857eeeb4761a1568c15ebb442932
Author: rfscholte 
Date:   Wed Feb 8 21:55:30 2017 +0100

[MNG-6109] PluginDescriptor doesn't read since value of parameter

commit 76b539ecf2733b2a8564c18581d60176dc0185a3
Author: rfscholte 
Date:   Mon Oct 31 21:05:28 2016 +0100

PluginDescriptor doesn't read since value of parameter


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

Branch: refs/heads/DEPMGMT-IMPORT
Commit: f4e07acbc2a496a8866b8270e7f7a9fd44085f71
Parents: 66a0fbe
Author: rfscholte 
Authored: Fri Feb 10 17:05:24 2017 +0100
Committer: rfscholte 
Committed: Fri Feb 10 17:05:24 2017 +0100

--
 .../apache/maven/plugin/descriptor/PluginDescriptorBuilder.java| 2 ++
 .../maven/plugin/descriptor/PluginDescriptorBuilderTest.java   | 1 +
 maven-plugin-api/src/test/resources/plugin.xml | 1 +
 3 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f4e07acb/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
--
diff --git 
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
 
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
index 7224554..9508c51 100644
--- 
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
+++ 
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
@@ -299,6 +299,8 @@ public class PluginDescriptorBuilder
 
 parameter.setImplementation( d.getChild( "implementation" 
).getValue() );
 
+parameter.setSince( d.getChild( "since" ).getValue() );
+
 PlexusConfiguration paramConfig = mojoConfig.getChild( 
parameter.getName(), false );
 if ( paramConfig != null )
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/f4e07acb/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
--
diff --git 
a/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
 
b/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
index 799e3af..b9f5ab9 100644
--- 
a/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
+++ 
b/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java
@@ -108,6 +108,7 @@ public class PluginDescriptorBuilderTest
 assertEquals( "deprecated-parameter", mp.getDeprecated() );
 assertEquals( "${jar.finalName}", mp.getExpression() );
 assertEquals( "${project.build.finalName}", mp.getDefaultValue() );
+assertEquals( "3.0.0", mp.getSince() );
 
 ComponentRequirement cr = md.getRequirements().get( 0 );
 

http://git-wip-us.apache.org/repos/asf/maven/blob/f4e07acb/maven-plugin-api/src/test/resources/plugin.xml
--
diff --git a/maven-plugin-api/src/test/resources/plugin.xml 
b/maven-plugin-api/src/test/resources/plugin.xml
index 6b97211..add46dc 100644
--- a/maven-plugin-api/src/test/resources/plugin.xml
+++ b/maven-plugin-api/src/test/resources/plugin.xml
@@ -60,6 +60,7 @@ under the License.
   true
   parameter-description
   deprecated-parameter
+  3.0.0

[1/6] maven git commit: [MNG-5961] Fix the SLF4J logger factory implementation used for LOG4J2 [Forced Update!]

2017-02-10 Thread schulte 
Repository: maven
Updated Branches:
  refs/heads/MNG-2199-IT 37530a4e6 -> f70c03371 (forced update)


[MNG-5961] Fix the SLF4J logger factory implementation used for LOG4J2

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

Branch: refs/heads/MNG-2199-IT
Commit: 23ceca36e7c980cc8d8bdc16d64ede98189079aa
Parents: 1740265
Author: Arnaud Heritier 
Authored: Tue Jan 31 10:26:28 2017 +0100
Committer: Arnaud HERITIER 
Committed: Mon Feb 6 00:26:14 2017 +0100

--
 .../main/resources/META-INF/maven/slf4j-configuration.properties   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/23ceca36/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
--
diff --git 
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
 
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
index ae1bc39..ff865bc 100644
--- 
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
+++ 
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
@@ -19,5 +19,5 @@
 # value = corresponding o.a.m.cli.logging.Slf4jConfiguration class
 org.slf4j.impl.SimpleLoggerFactory 
org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
 org.slf4j.impl.MavenSimpleLoggerFactory 
org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
-org.slf4j.helpers.Log4jLoggerFactory 
org.apache.maven.cli.logging.impl.Log4j2Configuration
+org.apache.logging.slf4j.Log4jLoggerFactory 
org.apache.maven.cli.logging.impl.Log4j2Configuration
 ch.qos.logback.classic.LoggerContext 
org.apache.maven.cli.logging.impl.LogbackConfiguration