You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2017/03/08 18:41:59 UTC
[01/15] maven git commit: [MNG-6183] Dependency management debug
message enhancements. [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/DEPMGMT 3845f5c35 -> f99ff62f0 (forced update)
[MNG-6183] Dependency management debug message enhancements.
o Updated to add debug log messages about optional flag management.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34afec69
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34afec69
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34afec69
Branch: refs/heads/DEPMGMT
Commit: 34afec69c866f731f3f9d9b3606bbc31b51d64e7
Parents: ab800b0
Author: Christian Schulte <sc...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:37:31 2017 +0100
----------------------------------------------------------------------
.../maven/project/DefaultProjectDependenciesResolver.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/34afec69/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 16b60c2..21dfaa2 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -273,6 +273,14 @@ public class DefaultProjectDependenciesResolver
appendManagementSource( buffer, art, "version" );
buffer.append( ')' );
}
+
+ Boolean premanagedOptional = DependencyManagerUtils.getPremanagedOptional( node );
+ if ( premanagedOptional != null && !premanagedOptional.equals( dep.getOptional() ) )
+ {
+ buffer.append( " (optionality managed from " ).append( premanagedOptional );
+ appendManagementSource( buffer, art, "optional" );
+ buffer.append( ')' );
+ }
}
else
{
[13/15] maven git commit: [MNG-5761] Dependency management is not
transitive.
Posted by sc...@apache.org.
[MNG-5761] Dependency management is not transitive.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/67249bb9
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/67249bb9
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/67249bb9
Branch: refs/heads/DEPMGMT
Commit: 67249bb9402b4e7caf3b80456c0ac1f2d5883841
Parents: 53f3cde
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Dec 13 22:35:13 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:41:23 2017 +0100
----------------------------------------------------------------------
.../maven/artifact/AbstractArtifactComponentTestCase.java | 4 ++--
.../maven/repository/internal/MavenRepositorySystemUtils.java | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/67249bb9/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index 0cdea19..8e054e5 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -39,7 +39,7 @@ import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.collection.DependencyTraverser;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
@@ -349,7 +349,7 @@ public abstract class AbstractArtifactComponentTestCase
DependencyTraverser depTraverser = new FatArtifactTraverser();
session.setDependencyTraverser( depTraverser );
- DependencyManager depManager = new ClassicDependencyManager();
+ DependencyManager depManager = new TransitiveDependencyManager();
session.setDependencyManager( depManager );
DependencySelector depFilter = new AndDependencySelector( new ScopeDependencySelector( "test", "provided" ),
http://git-wip-us.apache.org/repos/asf/maven/blob/67249bb9/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 1b11cb3..f6aeb11 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -20,7 +20,6 @@ package org.apache.maven.repository.internal;
*/
import java.util.Properties;
-
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.artifact.DefaultArtifactType;
import org.eclipse.aether.collection.DependencyGraphTransformer;
@@ -33,7 +32,7 @@ import org.eclipse.aether.impl.MetadataGeneratorFactory;
import org.eclipse.aether.impl.VersionRangeResolver;
import org.eclipse.aether.impl.VersionResolver;
import org.eclipse.aether.util.artifact.DefaultArtifactTypeRegistry;
-import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
@@ -95,7 +94,7 @@ public final class MavenRepositorySystemUtils
DependencyTraverser depTraverser = new FatArtifactTraverser();
session.setDependencyTraverser( depTraverser );
- DependencyManager depManager = new ClassicDependencyManager();
+ DependencyManager depManager = new TransitiveDependencyManager();
session.setDependencyManager( depManager );
DependencySelector depFilter =
[08/15] maven git commit: [MNG-4347] import-scoped dependencies of
direct dependencies are not resolved using profile modifications from
settings.xml
Posted by sc...@apache.org.
[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/6500c7ab
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6500c7ab
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6500c7ab
Branch: refs/heads/DEPMGMT
Commit: 6500c7abbef91e33efa47e4d5af5e2f64cc1ac8e
Parents: 7703955
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Dec 13 03:30:32 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:40:58 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/6500c7ab/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 3e82eb9..3be37d0 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<RemoteRepository> externalRepositories;
+ private final Set<String> externalRepositoryIds;
+
private final ArtifactResolver resolver;
private final VersionRangeResolver versionRangeResolver;
@@ -93,8 +95,13 @@ class DefaultModelResolver
List<RemoteRepository> 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;
}
[03/15] maven git commit: [MNG-5600] Dependency management import
should support exclusions.
Posted by sc...@apache.org.
[MNG-5600] Dependency management import should support exclusions.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a737ac87
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a737ac87
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a737ac87
Branch: refs/heads/DEPMGMT
Commit: a737ac87320816010945501cea12b8b638e0033a
Parents: 12247ff
Author: Christian Schulte <sc...@apache.org>
Authored: Sun Jun 19 16:32:25 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:40:30 2017 +0100
----------------------------------------------------------------------
.../model/building/DefaultModelBuilder.java | 57 +++++++++++++++-----
1 file changed, 45 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/a737ac87/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 e3beb2c..6d0b4a9 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
@@ -19,6 +19,16 @@ package org.apache.maven.model.building;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import org.apache.commons.lang3.Validate;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -28,6 +38,7 @@ import org.apache.maven.model.Activation;
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.Exclusion;
import org.apache.maven.model.InputLocation;
import org.apache.maven.model.InputSource;
import org.apache.maven.model.Model;
@@ -63,17 +74,6 @@ import org.apache.maven.model.validation.ModelValidator;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import static org.apache.maven.model.building.Result.error;
import static org.apache.maven.model.building.Result.newResult;
@@ -1223,7 +1223,40 @@ public class DefaultModelBuilder
importMgmt = new DependencyManagement();
}
- putCache( request.getModelCache(), groupId, artifactId, version, ModelCacheTag.IMPORT, importMgmt );
+ // [MNG-5600] Dependency management import should support exclusions.
+ if ( !dependency.getExclusions().isEmpty() )
+ {
+ for ( final Exclusion exclusion : dependency.getExclusions() )
+ {
+ if ( exclusion.getGroupId() != null && exclusion.getArtifactId() != null )
+ {
+ for ( final Iterator<Dependency> dependencies = importMgmt.getDependencies().iterator();
+ dependencies.hasNext(); )
+ {
+ final Dependency candidate = dependencies.next();
+
+ if ( ( exclusion.getGroupId().equals( "*" )
+ || exclusion.getGroupId().equals( candidate.getGroupId() ) )
+ && ( exclusion.getArtifactId().equals( "*" )
+ || exclusion.getArtifactId().equals( candidate.getArtifactId() ) ) )
+ {
+ // Dependency excluded from import.
+ dependencies.remove();
+ }
+ }
+ }
+ }
+
+ for ( final Dependency includedDependency : importMgmt.getDependencies() )
+ {
+ includedDependency.getExclusions().addAll( dependency.getExclusions() );
+ }
+ }
+ else
+ {
+ // Only dependency managements without exclusion processing applied can be cached.
+ putCache( request.getModelCache(), groupId, artifactId, version, ModelCacheTag.IMPORT, importMgmt );
+ }
}
if ( importMgmts == null )
[06/15] maven git commit: o Updated version to 3.6.0-SNAPSHOT to make
the ITs run.
Posted by sc...@apache.org.
o Updated version to 3.6.0-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/cdb327d0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cdb327d0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cdb327d0
Branch: refs/heads/DEPMGMT
Commit: cdb327d0311dd3a9a8b9df3addd608beb065fc11
Parents: 3f218a6
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Jan 31 03:15:47 2017 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:40:58 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/cdb327d0/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index d313f80..2c52eb0 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>apache-maven</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index b13482b..089f4ac 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>maven-artifact</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-builder-support/pom.xml
----------------------------------------------------------------------
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 5eb7903..6ca5ca2 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>maven-builder-support</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index b06d3f3..d4f53bd 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>maven-compat</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 71f09c0..053aafc 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>maven-core</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 66e09a3..918d7d3 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>maven-embedder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 859f0b3..f62e640 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>maven-model-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-model/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index aabb25d..0ed9879 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>maven-model</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-plugin-api/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index 1596a41..0d87ce8 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>maven-plugin-api</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-repository-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index dcc6a22..fbb3dbb 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>maven-repository-metadata</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-resolver-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index a724d3b..2fc109b 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-provider</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-settings-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index 904b085..3d8bdca 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>maven-settings-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-settings/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index eb4ad22..0eccc1a 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>maven-settings</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/maven-slf4j-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
index 315b9a7..958f08f 100644
--- a/maven-slf4j-provider/pom.xml
+++ b/maven-slf4j-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>maven-slf4j-provider</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/cdb327d0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4423e19..45fe5d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Maven</name>
[09/15] maven git commit: [MNG-5639] Support resolution of Import
Scope POMs from Repo that contains a ${parameter}
Posted by sc...@apache.org.
[MNG-5639] Support resolution of Import Scope POMs from Repo that contains a ${parameter}
o Updated to stop replacing external repositories when repository merging is set
to REQUEST_DOMINANT.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7d3c50ad
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7d3c50ad
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7d3c50ad
Branch: refs/heads/DEPMGMT
Commit: 7d3c50ad0f7e99d4734693177c990d10e878bd5c
Parents: 6500c7a
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Dec 13 20:16:20 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:40:58 2017 +0100
----------------------------------------------------------------------
.../project/DefaultProjectBuildingRequest.java | 19 +++++++++++--------
.../maven/project/ProjectModelResolver.java | 12 +++++++++++-
2 files changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/7d3c50ad/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
index dafbefd..d42da04 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
@@ -80,22 +80,25 @@ public class DefaultProjectBuildingRequest
pluginArtifactRepositories = new ArrayList<>();
}
+ @SuppressWarnings( "deprecation" )
public DefaultProjectBuildingRequest( ProjectBuildingRequest request )
{
this();
- setProcessPlugins( request.isProcessPlugins() );
- setProfiles( request.getProfiles() );
setActiveProfileIds( request.getActiveProfileIds() );
+ setBuildStartTime( request.getBuildStartTime() );
setInactiveProfileIds( request.getInactiveProfileIds() );
- setSystemProperties( request.getSystemProperties() );
- setUserProperties( request.getUserProperties() );
- setRemoteRepositories( request.getRemoteRepositories() );
- setPluginArtifactRepositories( request.getPluginArtifactRepositories() );
- setRepositorySession( request.getRepositorySession() );
setLocalRepository( request.getLocalRepository() );
- setBuildStartTime( request.getBuildStartTime() );
+ setPluginArtifactRepositories( request.getPluginArtifactRepositories() );
+ setProcessPlugins( request.isProcessPlugins() );
+ setProfiles( request.getProfiles() );
setProject( request.getProject() );
+ setRemoteRepositories( request.getRemoteRepositories() );
+ setRepositoryMerging( request.getRepositoryMerging() );
+ setRepositorySession( request.getRepositorySession() );
setResolveDependencies( request.isResolveDependencies() );
+ setResolveVersionRanges( request.isResolveVersionRanges() );
+ setSystemProperties( request.getSystemProperties() );
+ setUserProperties( request.getUserProperties() );
setValidationLevel( request.getValidationLevel() );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/7d3c50ad/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 3a31d33..531ae0b 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
@@ -78,6 +78,8 @@ public class ProjectModelResolver
private final Set<String> repositoryIds;
+ private final Set<String> externalRepositoryIds;
+
private final ReactorModelPool modelPool;
private final ProjectBuildingRequest.RepositoryMerging repositoryMerging;
@@ -99,7 +101,13 @@ public class ProjectModelResolver
this.repositories.addAll( externalRepositories );
this.repositoryMerging = repositoryMerging;
this.repositoryIds = new HashSet<>();
+ this.externalRepositoryIds = new HashSet<>();
this.modelPool = modelPool;
+ for ( final RemoteRepository repository : repositories )
+ {
+ this.repositoryIds.add( repository.getId() );
+ this.externalRepositoryIds.add( repository.getId() );
+ }
}
private ProjectModelResolver( ProjectModelResolver original )
@@ -113,6 +121,7 @@ public class ProjectModelResolver
this.repositories = new ArrayList<>( original.repositories );
this.repositoryMerging = original.repositoryMerging;
this.repositoryIds = new HashSet<>( original.repositoryIds );
+ this.externalRepositoryIds = new HashSet<>( original.externalRepositoryIds );
this.modelPool = original.modelPool;
}
@@ -128,7 +137,8 @@ public class ProjectModelResolver
{
if ( !repositoryIds.add( repository.getId() ) )
{
- if ( !replace )
+ if ( !replace || ( ProjectBuildingRequest.RepositoryMerging.REQUEST_DOMINANT.equals( repositoryMerging )
+ && this.externalRepositoryIds.contains( repository.getId() ) ) )
{
return;
}
[10/15] maven git commit: [MNG-1577] dependencyManagement does not
work for transitive dependencies
Posted by sc...@apache.org.
[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/53f3cde9
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/53f3cde9
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/53f3cde9
Branch: refs/heads/DEPMGMT
Commit: 53f3cde9823b2a07e27771239256bd1822fb47a5
Parents: 3cab133
Author: Christian Schulte <sc...@apache.org>
Authored: Wed Feb 3 19:17:02 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:41:23 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/53f3cde9/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 @@
<groupId>maven-test</groupId>
<artifactId>t06-d</artifactId>
<version>1.0</version>
- <scope>test</scope>
- <optional>false</optional>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/maven/blob/53f3cde9/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 @@
<groupId>maven-test</groupId>
<artifactId>t06-d</artifactId>
<version>1.2</version>
- <scope>test</scope>
- <optional>false</optional>
</dependency>
</dependencies>
</dependencyManagement>
[05/15] maven git commit: [MNG-5527] Dependency management import
should support relocations.
Posted by sc...@apache.org.
[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/12247ff7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/12247ff7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/12247ff7
Branch: refs/heads/DEPMGMT
Commit: 12247ff7f4922548c2037b9874841ae03eb9952f
Parents: d0911ac
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Jun 21 21:35:40 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:40:30 2017 +0100
----------------------------------------------------------------------
.../model/building/DefaultModelBuilder.java | 191 ++++++++++++-------
1 file changed, 126 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/12247ff7/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<DependencyManagement> importMgmts = null;
for ( Iterator<Dependency> 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( importSource );
- importRequest.setModelResolver( modelResolver.newCopy() );
+ // no workspace resolver or workspace resolver returned null (i.e. model not in workspace)
+ importModel = this.buildImportModelFromRepository( request, dependency, importIds, problems );
- final ModelBuildingResult importResult;
- try
- {
- importResult = build( importRequest );
- }
- catch ( ModelBuildingException e )
+ if ( importModel == null )
{
- problems.addAll( e.getProblems() );
continue;
}
-
- problems.addAll( importResult.getProblems() );
-
- importModel = importResult.getEffectiveModel();
}
importMgmt = importModel.getDependencyManagement();
@@ -1301,6 +1239,129 @@ public class DefaultModelBuilder
dependencyManagementImporter.importManagement( model, importMgmts, request, problems );
}
+ private Model buildImportModelFromRepository( final ModelBuildingRequest targetModelBuildingRequest,
+ final Dependency dependency, final Collection<String> importIds,
+ final DefaultModelProblemCollector problems )
+ {
+ try
+ {
+ final String imported =
+ String.format( "%s:%s:%s", dependency.getGroupId(), dependency.getArtifactId(),
+ dependency.getVersion() );
+
+ final Dependency resolvedDependency = dependency.clone();
+ final ModelSource importSource =
+ targetModelBuildingRequest.getModelResolver().resolveModel( resolvedDependency );
+
+ final String resolvedId =
+ String.format( "%s:%s:%s", resolvedDependency.getGroupId(), resolvedDependency.getArtifactId(),
+ resolvedDependency.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=" + dependency.getScope() + " form a cycle: ";
+ for ( String modelId : importIds )
+ {
+ message += modelId + " -> ";
+ }
+ message += resolvedId;
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).setMessage( message ) );
+ }
+ else
+ {
+ final ModelBuildingRequest importRequest = new DefaultModelBuildingRequest();
+ importRequest.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
+ importRequest.setModelCache( targetModelBuildingRequest.getModelCache() );
+ importRequest.setSystemProperties( targetModelBuildingRequest.getSystemProperties() );
+ importRequest.setUserProperties( targetModelBuildingRequest.getUserProperties() );
+ importRequest.setLocationTracking( targetModelBuildingRequest.isLocationTracking() );
+ importRequest.setModelSource( importSource );
+ importRequest.setModelResolver( targetModelBuildingRequest.getModelResolver().newCopy() );
+
+ final ModelBuildingResult importResult = build( importRequest );
+ problems.addAll( importResult.getProblems() );
+
+ Model importModel = importResult.getEffectiveModel();
+
+ if ( importModel.getDistributionManagement() != null
+ && importModel.getDistributionManagement().getRelocation() != null )
+ {
+ final Dependency relocated = dependency.clone();
+ relocated.setGroupId( importModel.getDistributionManagement().getRelocation().getGroupId() );
+ relocated.setArtifactId( importModel.getDistributionManagement().getRelocation().getArtifactId() );
+ relocated.setVersion( importModel.getDistributionManagement().getRelocation().getVersion() );
+
+ // Message below is checked for in the MNG-5527 core IT.
+ String message = String.format(
+ "The dependency of type='%s' and scope='%s' has been relocated to '%s:%s:%s'",
+ dependency.getType(), dependency.getScope(), relocated.getGroupId(),
+ relocated.getArtifactId(), relocated.getVersion() );
+
+ if ( importModel.getDistributionManagement().getRelocation().getMessage() != null )
+ {
+ message += ". " + importModel.getDistributionManagement().getRelocation().getMessage();
+ }
+
+ problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.BASE ).
+ setMessage( message ).
+ setLocation( importModel.getDistributionManagement().getRelocation().getLocation( "" ) ) );
+
+ importModel = this.buildImportModelFromRepository(
+ targetModelBuildingRequest, relocated, importIds, problems );
+
+ }
+
+ return importModel;
+ }
+ }
+ catch ( final UnresolvableModelException e )
+ {
+ final StringBuilder buffer = new StringBuilder( 256 );
+ buffer.append( "Non-resolvable " ).append( dependency.getScope() ).append( " POM" );
+
+ if ( !containsCoordinates( e.getMessage(), dependency.getGroupId(), dependency.getArtifactId(),
+ dependency.getVersion() ) )
+ {
+ buffer.append( ' ' ).append( ModelProblemUtils.toId(
+ dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() ) );
+
+ }
+
+ buffer.append( ": " ).append( e.getMessage() );
+
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).
+ setMessage( buffer.toString() ).
+ setLocation( dependency.getLocation( "" ) ).
+ setException( e ) );
+
+ }
+ catch ( final ModelBuildingException e )
+ {
+ final StringBuilder buffer = new StringBuilder( 256 );
+ buffer.append( "Failure building " ).append( dependency.getScope() ).append( " POM" );
+
+ if ( !containsCoordinates( e.getMessage(), dependency.getGroupId(), dependency.getArtifactId(),
+ dependency.getVersion() ) )
+ {
+ buffer.append( ' ' ).append( ModelProblemUtils.toId(
+ dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() ) );
+
+ }
+
+ buffer.append( ": " ).append( e.getMessage() );
+
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).
+ setMessage( buffer.toString() ).
+ setLocation( dependency.getLocation( "" ) ).
+ setException( e ) );
+
+ problems.addAll( e.getProblems() );
+ }
+
+ return null;
+ }
+
private <T> void putCache( ModelCache modelCache, String groupId, String artifactId, String version,
ModelCacheTag<T> tag, T data )
{
[12/15] maven git commit: [MNG-6135] Maven plugins and core
extensions are not dependencies,
they should be resolved the same way as projects.
Posted by sc...@apache.org.
[MNG-6135] Maven plugins and core extensions are not dependencies, they should be resolved the same way as projects.
o Updated to use the '<prerequisites>' element to decide the style of resolution
as discussed on dev@. Plugins with prerequisites >= 3.6 get the correct
resolution, all other plugins will be resolved with direct 'test' and
'provided' dependencies ignored but direct 'optional' dependencies.
o During working on MNG-6135, it turned out that plugin dependency management
also is applied to the dependencies declared for a plugin using the
'plugins/plugin/dependencies/dependency' element. Dependencies declared
that way must not be overridden by any management. I added management for
'plexus-utils' in the core IT suite. This immediately made the ITs for
MNG-4276 and MNG-4274 fail, because 'plexus-utils' got subject to management
although a different version has been declared in the plugin declaration.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f99ff62f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f99ff62f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f99ff62f
Branch: refs/heads/DEPMGMT
Commit: f99ff62f0f05e8b900e075c74e4f532a1fb0eb7c
Parents: 67249bb
Author: Christian Schulte <sc...@apache.org>
Authored: Sat Dec 17 03:07:04 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:41:23 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/maven/RepositoryUtils.java | 12 +-
.../DefaultPluginDependenciesResolver.java | 370 ++++++++++++++++---
.../plugin/internal/PlexusUtilsInjector.java | 30 +-
.../maven/plugin/internal/WagonExcluder.java | 14 +-
4 files changed, 344 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/f99ff62f/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 52442b7..08749ea 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -114,12 +114,16 @@ public class RepositoryUtils
List<String> nodeTrail = new ArrayList<>( trail.size() + 1 );
nodeTrail.addAll( trail );
- nodeTrail.add( artifact.getId() );
- if ( filter == null || filter.accept( node, Collections.<DependencyNode>emptyList() ) )
+ if ( artifact != null )
{
- artifact.setDependencyTrail( nodeTrail );
- artifacts.add( artifact );
+ nodeTrail.add( artifact.getId() );
+
+ if ( filter == null || filter.accept( node, Collections.<DependencyNode>emptyList() ) )
+ {
+ artifact.setDependencyTrail( nodeTrail );
+ artifacts.add( artifact );
+ }
}
toArtifacts( artifacts, node.getChildren(), nodeTrail, filter );
http://git-wip-us.apache.org/repos/asf/maven/blob/f99ff62f/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index b79b15f..80fd80d 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -20,10 +20,11 @@ package org.apache.maven.plugin.internal;
*/
import java.util.LinkedHashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-
import org.apache.maven.RepositoryUtils;
+import org.apache.maven.artifact.versioning.ComparableVersion;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.PluginResolutionException;
@@ -37,8 +38,11 @@ import org.eclipse.aether.RequestTrace;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.collection.CollectRequest;
+import org.eclipse.aether.collection.DependencyCollectionContext;
import org.eclipse.aether.collection.DependencyCollectionException;
import org.eclipse.aether.collection.DependencyGraphTransformer;
+import org.eclipse.aether.collection.DependencyManagement;
+import org.eclipse.aether.collection.DependencyManager;
import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.graph.DependencyFilter;
import org.eclipse.aether.graph.DependencyNode;
@@ -54,8 +58,14 @@ import org.eclipse.aether.resolution.DependencyResolutionException;
import org.eclipse.aether.util.artifact.JavaScopes;
import org.eclipse.aether.util.filter.AndDependencyFilter;
import org.eclipse.aether.util.filter.ScopeDependencyFilter;
+import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
+import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
+import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
+import org.eclipse.aether.util.graph.selector.OptionalDependencySelector;
import org.eclipse.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
+import org.eclipse.aether.util.graph.visitor.FilteringDependencyVisitor;
+import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator;
import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
/**
@@ -73,6 +83,10 @@ public class DefaultPluginDependenciesResolver
private static final String REPOSITORY_CONTEXT = "plugin";
+ private static final String DEFAULT_PREREQUISITES = "2.0";
+
+ private static final ComparableVersion DEFAULT_RESULTION_PREREQUISITES = new ComparableVersion( "3.6" );
+
@Requirement
private Logger logger;
@@ -85,50 +99,21 @@ public class DefaultPluginDependenciesResolver
session.getArtifactTypeRegistry().get( "maven-plugin" ) );
}
+ @Override
public Artifact resolve( Plugin plugin, List<RemoteRepository> repositories, RepositorySystemSession session )
throws PluginResolutionException
{
- RequestTrace trace = RequestTrace.newChild( null, plugin );
-
- Artifact pluginArtifact = toArtifact( plugin, session );
-
- try
- {
- DefaultRepositorySystemSession pluginSession = new DefaultRepositorySystemSession( session );
- pluginSession.setArtifactDescriptorPolicy( new SimpleArtifactDescriptorPolicy( true, false ) );
-
- ArtifactDescriptorRequest request =
- new ArtifactDescriptorRequest( pluginArtifact, repositories, REPOSITORY_CONTEXT );
- request.setTrace( trace );
- ArtifactDescriptorResult result = repoSystem.readArtifactDescriptor( pluginSession, request );
-
- pluginArtifact = result.getArtifact();
-
- String requiredMavenVersion = (String) result.getProperties().get( "prerequisites.maven" );
- if ( requiredMavenVersion != null )
- {
- Map<String, String> props = new LinkedHashMap<>( pluginArtifact.getProperties() );
- props.put( "requiredMavenVersion", requiredMavenVersion );
- pluginArtifact = pluginArtifact.setProperties( props );
- }
- }
- catch ( ArtifactDescriptorException e )
- {
- throw new PluginResolutionException( plugin, e );
- }
-
try
{
- ArtifactRequest request = new ArtifactRequest( pluginArtifact, repositories, REPOSITORY_CONTEXT );
- request.setTrace( trace );
- pluginArtifact = repoSystem.resolveArtifact( session, request ).getArtifact();
+ final Artifact pluginArtifact = this.createPluginArtifact( plugin, session, repositories );
+ final ArtifactRequest request = new ArtifactRequest( pluginArtifact, repositories, REPOSITORY_CONTEXT );
+ request.setTrace( RequestTrace.newChild( null, plugin ) );
+ return this.repoSystem.resolveArtifact( session, request ).getArtifact();
}
- catch ( ArtifactResolutionException e )
+ catch ( ArtifactDescriptorException | ArtifactResolutionException e )
{
throw new PluginResolutionException( plugin, e );
}
-
- return pluginArtifact;
}
/**
@@ -150,56 +135,237 @@ public class DefaultPluginDependenciesResolver
session );
}
- private DependencyNode resolveInternal( Plugin plugin, Artifact pluginArtifact, DependencyFilter dependencyFilter,
- DependencyGraphTransformer transformer,
- List<RemoteRepository> repositories, RepositorySystemSession session )
+ private DependencyNode resolveInternal( final Plugin plugin, final Artifact artifact,
+ final DependencyFilter dependencyFilter,
+ final DependencyGraphTransformer transformer,
+ final List<RemoteRepository> repositories,
+ final RepositorySystemSession session )
throws PluginResolutionException
{
- RequestTrace trace = RequestTrace.newChild( null, plugin );
-
- if ( pluginArtifact == null )
+ // This dependency manager delegates to the session's dependency manager but supports excluding plugin
+ // dependency overrides from the plugins/plugin/dependencies POM element so that what is declared there will
+ // not get changed due to any management performed.
+ class PluginDependencyManager implements DependencyManager
{
- pluginArtifact = toArtifact( plugin, session );
+
+ private final int depth;
+
+ private final DependencyManager delegate;
+
+ private final List<Artifact> exclusions;
+
+ PluginDependencyManager( final DependencyManager delegate )
+ {
+ this( 0, delegate, new LinkedList<Artifact>() );
+ }
+
+ private PluginDependencyManager( final int depth, final DependencyManager delegate,
+ final List<Artifact> exclusions )
+ {
+ super();
+ this.depth = depth;
+ this.delegate = delegate;
+ this.exclusions = exclusions;
+ }
+
+ @Override
+ public DependencyManagement manageDependency( final org.eclipse.aether.graph.Dependency dependency )
+ {
+ boolean excluded = false;
+
+ for ( final Artifact exclusion : this.getExclusions() )
+ {
+ final Artifact artifact = dependency.getArtifact();
+
+ if ( exclusion.getGroupId().equals( artifact.getGroupId() )
+ && exclusion.getArtifactId().equals( artifact.getArtifactId() )
+ && exclusion.getExtension().equals( artifact.getExtension() )
+ && exclusion.getClassifier() != null
+ ? exclusion.getClassifier().equals( artifact.getClassifier() )
+ : dependency.getArtifact().getClassifier() == null )
+ {
+ excluded = true;
+ break;
+ }
+ }
+
+ return !excluded && this.depth >= 2 && this.delegate != null
+ ? this.delegate.manageDependency( dependency )
+ : null;
+
+ }
+
+ @Override
+ public DependencyManager deriveChildManager( final DependencyCollectionContext context )
+ {
+ return new PluginDependencyManager( this.depth + 1,
+ this.delegate != null
+ ? this.delegate.deriveChildManager( context )
+ : null,
+ this.exclusions );
+
+ }
+
+ public List<Artifact> getExclusions()
+ {
+ return this.exclusions;
+ }
+
}
- DependencyFilter collectionFilter = new ScopeDependencyFilter( "provided", "test" );
- DependencyFilter resolutionFilter = AndDependencyFilter.newInstance( collectionFilter, dependencyFilter );
+ // This dependency selector matches the resolver's implementation before MRESOLVER-8 got fixed. It is
+ // used for plugin's with prerequisites < 3.6 to mimic incorrect but backwards compatible behaviour.
+ class ClassicScopeDependencySelector implements DependencySelector
+ {
+
+ private final boolean transitive;
+
+ ClassicScopeDependencySelector()
+ {
+ this( false );
+ }
+
+ private ClassicScopeDependencySelector( final boolean transitive )
+ {
+ super();
+ this.transitive = transitive;
+ }
+
+ @Override
+ public boolean selectDependency( final org.eclipse.aether.graph.Dependency dependency )
+ {
+ return !this.transitive
+ || !( "test".equals( dependency.getScope() )
+ || "provided".equals( dependency.getScope() ) );
+
+ }
+
+ @Override
+ public DependencySelector deriveChildSelector( final DependencyCollectionContext context )
+ {
+ ClassicScopeDependencySelector child = this;
+
+ if ( context.getDependency() != null && !child.transitive )
+ {
+ child = new ClassicScopeDependencySelector( true );
+ }
+ if ( context.getDependency() == null && child.transitive )
+ {
+ child = new ClassicScopeDependencySelector( false );
+ }
+
+ return child;
+ }
+
+ @Override
+ public boolean equals( Object obj )
+ {
+ boolean equal = obj instanceof ClassicScopeDependencySelector;
+
+ if ( equal )
+ {
+ final ClassicScopeDependencySelector that = (ClassicScopeDependencySelector) obj;
+ equal = this.transitive == that.transitive;
+ }
- DependencyNode node;
+ return equal;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int hash = 17;
+ hash = hash * 31 + ( ( (Boolean) this.transitive ).hashCode() );
+ return hash;
+ }
+
+ }
+
+ final RequestTrace trace = RequestTrace.newChild( null, plugin );
+ final DependencyFilter collectionFilter = new ScopeDependencyFilter( "provided", "test" );
+ final DependencyFilter resolutionFilter = AndDependencyFilter.newInstance( collectionFilter, dependencyFilter );
try
{
- DependencySelector selector =
- AndDependencySelector.newInstance( session.getDependencySelector(), new WagonExcluder() );
+ final Artifact pluginArtifact = artifact != null
+ ? this.createPluginArtifact( artifact, session, repositories )
+ : this.createPluginArtifact( plugin, session, repositories );
+
+ final ComparableVersion prerequisites =
+ new ComparableVersion( pluginArtifact.getProperty( "requiredMavenVersion", DEFAULT_PREREQUISITES ) );
+
+ final boolean classicResolution = prerequisites.compareTo( DEFAULT_RESULTION_PREREQUISITES ) < 0;
+
+ if ( this.logger.isDebugEnabled() )
+ {
+ if ( classicResolution )
+ {
+ this.logger.debug( String.format(
+ "Constructing classic plugin classpath '%s' for prerequisites '%s'.",
+ pluginArtifact, prerequisites ) );
- transformer =
+ }
+ else
+ {
+ this.logger.debug( String.format(
+ "Constructing default plugin classpath '%s' for prerequisites '%s'.",
+ pluginArtifact, prerequisites ) );
+
+ }
+ }
+
+ final DependencySelector pluginDependencySelector =
+ classicResolution
+ ? new AndDependencySelector( new ClassicScopeDependencySelector(), // incorrect - see MRESOLVER-8
+ new OptionalDependencySelector(),
+ new ExclusionDependencySelector(),
+ new WagonExcluder() )
+ : AndDependencySelector.newInstance( session.getDependencySelector(), new WagonExcluder() );
+
+ final DependencyGraphTransformer pluginDependencyGraphTransformer =
ChainedDependencyGraphTransformer.newInstance( session.getDependencyGraphTransformer(), transformer );
+ final PluginDependencyManager pluginDependencyManager =
+ new PluginDependencyManager( classicResolution
+ ? new ClassicDependencyManager()
+ : session.getDependencyManager() );
+
DefaultRepositorySystemSession pluginSession = new DefaultRepositorySystemSession( session );
- pluginSession.setDependencySelector( selector );
- pluginSession.setDependencyGraphTransformer( transformer );
+ pluginSession.setDependencySelector( pluginDependencySelector );
+ pluginSession.setDependencyGraphTransformer( pluginDependencyGraphTransformer );
+ pluginSession.setDependencyManager( pluginDependencyManager );
CollectRequest request = new CollectRequest();
request.setRequestContext( REPOSITORY_CONTEXT );
request.setRepositories( repositories );
- request.setRoot( new org.eclipse.aether.graph.Dependency( pluginArtifact, null ) );
+
for ( Dependency dependency : plugin.getDependencies() )
{
org.eclipse.aether.graph.Dependency pluginDep =
- RepositoryUtils.toDependency( dependency, session.getArtifactTypeRegistry() );
+ RepositoryUtils.toDependency( dependency, session.getArtifactTypeRegistry() );
if ( !JavaScopes.SYSTEM.equals( pluginDep.getScope() ) )
{
pluginDep = pluginDep.setScope( JavaScopes.RUNTIME );
}
request.addDependency( pluginDep );
+
+ if ( logger.isDebugEnabled() )
+ {
+ logger.debug( String.format( "Collecting plugin dependency %s from project.", pluginDep ) );
+ }
+
+ pluginDependencyManager.getExclusions().
+ addAll( this.collectPluginDependencyArtifacts( session, repositories, pluginDep ) );
}
+ request.setRoot( new org.eclipse.aether.graph.Dependency( pluginArtifact, null ) );
+
DependencyRequest depRequest = new DependencyRequest( request, resolutionFilter );
depRequest.setTrace( trace );
request.setTrace( RequestTrace.newChild( trace, depRequest ) );
- node = repoSystem.collectDependencies( pluginSession, request ).getRoot();
+ final DependencyNode node = repoSystem.collectDependencies( pluginSession, request ).getRoot();
if ( logger.isDebugEnabled() )
{
@@ -208,8 +374,9 @@ public class DefaultPluginDependenciesResolver
depRequest.setRoot( node );
repoSystem.resolveDependencies( session, depRequest );
+ return node;
}
- catch ( DependencyCollectionException e )
+ catch ( ArtifactDescriptorException | DependencyCollectionException e )
{
throw new PluginResolutionException( plugin, e );
}
@@ -217,27 +384,110 @@ public class DefaultPluginDependenciesResolver
{
throw new PluginResolutionException( plugin, e.getCause() );
}
+ }
- return node;
+ private Artifact createPluginArtifact( final Plugin plugin,
+ final RepositorySystemSession session,
+ final List<RemoteRepository> repositories )
+ throws ArtifactDescriptorException
+ {
+ return this.createPluginArtifact( toArtifact( plugin, session ), session, repositories );
}
+ private Artifact createPluginArtifact( final Artifact artifact,
+ final RepositorySystemSession session,
+ final List<RemoteRepository> repositories )
+ throws ArtifactDescriptorException
+ {
+ Artifact pluginArtifact = artifact;
+ final DefaultRepositorySystemSession pluginSession = new DefaultRepositorySystemSession( session );
+ pluginSession.setArtifactDescriptorPolicy( new SimpleArtifactDescriptorPolicy( true, false ) );
+
+ final ArtifactDescriptorRequest request =
+ new ArtifactDescriptorRequest( pluginArtifact, repositories, REPOSITORY_CONTEXT );
+
+ request.setTrace( RequestTrace.newChild( null, artifact ) );
+
+ final ArtifactDescriptorResult result = this.repoSystem.readArtifactDescriptor( pluginSession, request );
+
+ pluginArtifact = result.getArtifact();
+
+ final String requiredMavenVersion = (String) result.getProperties().get( "prerequisites.maven" );
+
+ if ( requiredMavenVersion != null )
+ {
+ final Map<String, String> props = new LinkedHashMap<>( pluginArtifact.getProperties() );
+ props.put( "requiredMavenVersion", requiredMavenVersion );
+ pluginArtifact = pluginArtifact.setProperties( props );
+ }
+
+ return pluginArtifact;
+ }
+
+ private List<org.eclipse.aether.artifact.Artifact> collectPluginDependencyArtifacts(
+ final RepositorySystemSession session, final List<RemoteRepository> repositories,
+ final org.eclipse.aether.graph.Dependency pluginDependency )
+ throws DependencyCollectionException
+ {
+ final CollectRequest request = new CollectRequest();
+ request.setRequestContext( REPOSITORY_CONTEXT );
+ request.setRepositories( repositories );
+ request.setRoot( pluginDependency );
+ request.setTrace( RequestTrace.newChild( null, pluginDependency ) );
+
+ final DependencyNode node = repoSystem.collectDependencies( session, request ).getRoot();
+
+ if ( logger.isDebugEnabled() )
+ {
+ node.accept( new GraphLogger() );
+ }
+
+ final PreorderNodeListGenerator nodeListGenerator = new PreorderNodeListGenerator();
+ final DependencyFilter scopeDependencyFilter = new ScopeDependencyFilter( "provided", "test" );
+ node.accept( new FilteringDependencyVisitor( nodeListGenerator, scopeDependencyFilter ) );
+ return nodeListGenerator.getArtifacts( true );
+ }
+
+ // Keep this class in sync with org.apache.maven.project.DefaultProjectDependenciesResolver.GraphLogger
class GraphLogger
implements DependencyVisitor
{
private String indent = "";
+ GraphLogger()
+ {
+ super();
+ }
+
public boolean visitEnter( DependencyNode node )
{
+ assert node.getDependency() != null : "Unexpected POM resolution result.";
+
StringBuilder buffer = new StringBuilder( 128 );
buffer.append( indent );
org.eclipse.aether.graph.Dependency dep = node.getDependency();
- if ( dep != null )
+ org.eclipse.aether.artifact.Artifact art = dep.getArtifact();
+
+ buffer.append( art );
+ buffer.append( ':' ).append( dep.getScope() );
+
+ String premanagedScope = DependencyManagerUtils.getPremanagedScope( node );
+ if ( premanagedScope != null && !premanagedScope.equals( dep.getScope() ) )
+ {
+ buffer.append( " (scope managed from " ).append( premanagedScope ).append( ')' );
+ }
+
+ String premanagedVersion = DependencyManagerUtils.getPremanagedVersion( node );
+ if ( premanagedVersion != null && !premanagedVersion.equals( art.getVersion() ) )
{
- Artifact art = dep.getArtifact();
+ buffer.append( " (version managed from " ).append( premanagedVersion ).append( ')' );
+ }
- buffer.append( art );
- buffer.append( ':' ).append( dep.getScope() );
+ Boolean premanagedOptional = DependencyManagerUtils.getPremanagedOptional( node );
+ if ( premanagedOptional != null && !premanagedOptional.equals( dep.getOptional() ) )
+ {
+ buffer.append( " (optionality managed from " ).append( premanagedOptional ).append( ')' );
}
logger.debug( buffer.toString() );
http://git-wip-us.apache.org/repos/asf/maven/blob/f99ff62f/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
index 16a0b63..eb36957 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusUtilsInjector.java
@@ -64,24 +64,32 @@ class PlexusUtilsInjector
private DependencyNode findPlexusUtils( DependencyNode node )
{
- Artifact artifact = node.getDependency().getArtifact();
+ DependencyNode plexusUtils = null;
- if ( AID.equals( artifact.getArtifactId() ) && GID.equals( artifact.getGroupId() )
- && EXT.equals( artifact.getExtension() ) && "".equals( artifact.getClassifier() ) )
+ find:
{
- return node;
- }
+ if ( AID.equals( node.getArtifact().getArtifactId() )
+ && GID.equals( node.getArtifact().getGroupId() )
+ && EXT.equals( node.getArtifact().getExtension() )
+ && "".equals( node.getArtifact().getClassifier() ) )
+ {
+ plexusUtils = node;
+ break find;
+ }
- for ( DependencyNode child : node.getChildren() )
- {
- DependencyNode result = findPlexusUtils( child );
- if ( result != null )
+ for ( DependencyNode child : node.getChildren() )
{
- return result;
+ DependencyNode result = findPlexusUtils( child );
+
+ if ( result != null )
+ {
+ plexusUtils = result;
+ break find;
+ }
}
}
- return null;
+ return plexusUtils;
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/f99ff62f/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
index 43e8cfc..94a4814 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/WagonExcluder.java
@@ -51,19 +51,19 @@ class WagonExcluder
public boolean selectDependency( Dependency dependency )
{
- return !coreArtifact || !isWagonProvider( dependency.getArtifact() );
+ return !( coreArtifact && isWagonProvider( dependency.getArtifact() ) );
}
public DependencySelector deriveChildSelector( DependencyCollectionContext context )
{
- if ( coreArtifact || !isLegacyCoreArtifact( context.getDependency().getArtifact() ) )
- {
- return this;
- }
- else
+ WagonExcluder child = this;
+
+ if ( isLegacyCoreArtifact( context.getArtifact() ) && !this.coreArtifact )
{
- return new WagonExcluder( true );
+ child = new WagonExcluder( true );
}
+
+ return child;
}
private boolean isLegacyCoreArtifact( Artifact artifact )
[04/15] maven git commit: [MNG-4463] Dependency management import
should support version ranges.
Posted by sc...@apache.org.
[MNG-4463] Dependency management import should support version ranges.
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/d0911ac5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d0911ac5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d0911ac5
Branch: refs/heads/DEPMGMT
Commit: d0911ac57dccb758435cdfd3495121ec9f0ae1b4
Parents: 34afec6
Author: Christian Schulte <sc...@apache.org>
Authored: Sat Jan 30 19:17:34 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:40:30 2017 +0100
----------------------------------------------------------------------
.../model/building/DefaultModelBuilder.java | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d0911ac5/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 4ebb033..3699bd9 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
@@ -1213,7 +1213,25 @@ public class DefaultModelBuilder
final ModelSource importSource;
try
{
- importSource = modelResolver.resolveModel( groupId, artifactId, version );
+ 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 )
{
[02/15] maven git commit: o Updated to 3.5.1-SNAPSHOT to make the ITs
run.
Posted by sc...@apache.org.
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/77039555
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/77039555
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/77039555
Branch: refs/heads/DEPMGMT
Commit: 77039555e2a6f329f63c1e26966ddb26f940af35
Parents: a737ac8
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Jan 31 03:17:58 2017 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:40:30 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/77039555/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.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>apache-maven</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/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.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-artifact</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/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.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-builder-support</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/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.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-compat</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 0e20235..71f09c0 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-core</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/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.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-embedder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 0dd08ac..859f0b3 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-model-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/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.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-model</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-plugin-api/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index d8f802d..1596a41 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-plugin-api</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-repository-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index 7480de7..dcc6a22 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-repository-metadata</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-resolver-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index e95cc41..a724d3b 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-provider</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-settings-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index 2d415c9..904b085 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-settings-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-settings/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 133ee32..eb4ad22 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-settings</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/maven-slf4j-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
index 81af382..315b9a7 100644
--- a/maven-slf4j-provider/pom.xml
+++ b/maven-slf4j-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-slf4j-provider</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/77039555/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ba06feb..4423e19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Maven</name>
[07/15] maven git commit: [MNG-5971] Imported dependencies should be
available to inheritance processing
Posted by sc...@apache.org.
[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/3f218a60
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3f218a60
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3f218a60
Branch: refs/heads/DEPMGMT
Commit: 3f218a6024f9b40365f19dba5fbba59bd0007c35
Parents: 7d3c50a
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Feb 18 14:07:02 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:40:58 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 | 12 +-
5 files changed, 528 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/3f218a60/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 6d0b4a9..a010db5 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;
@@ -84,6 +85,7 @@ import static org.apache.maven.model.building.Result.newResult;
public class DefaultModelBuilder
implements ModelBuilder
{
+
@Requirement
private ModelProcessor modelProcessor;
@@ -250,8 +252,8 @@ public class DefaultModelBuilder
DefaultProfileActivationContext profileActivationContext = getProfileActivationContext( request );
problems.setSource( "(external profiles)" );
- List<Profile> activeExternalProfiles = profileSelector.getActiveProfiles( request.getProfiles(),
- profileActivationContext, problems );
+ List<Profile> activeExternalProfiles =
+ profileSelector.getActiveProfiles( request.getProfiles(), profileActivationContext, problems );
result.setActiveExternalProfiles( activeExternalProfiles );
@@ -298,8 +300,9 @@ public class DefaultModelBuilder
profileActivationContext.setProjectProperties( tmpModel.getProperties() );
- List<Profile> activePomProfiles = profileSelector.getActiveProfiles( rawModel.getProfiles(),
- profileActivationContext, problems );
+ List<Profile> activePomProfiles =
+ profileSelector.getActiveProfiles( rawModel.getProfiles(), profileActivationContext, problems );
+
currentData.setActiveProfiles( activePomProfiles );
Map<String, Activation> interpolatedActivations = getProfileActivations( rawModel, false );
@@ -334,13 +337,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()
- : currentData.getRawModel()
- .getVersion() );
+ currentData.setVersion( currentData.getRawModel().getVersion() == null
+ ? parentData.getVersion()
+ : currentData.getRawModel().getVersion() );
currentData.setArtifactId( currentData.getRawModel().getArtifactId() );
parentIds.add( currentData.getId() );
@@ -359,8 +362,9 @@ public class DefaultModelBuilder
}
message += parentData.getId();
- problems.add( new ModelProblemCollectorRequest( ModelProblem.Severity.FATAL, ModelProblem.Version.BASE )
- .setMessage( message ) );
+ problems.add( new ModelProblemCollectorRequest( ModelProblem.Severity.FATAL,
+ ModelProblem.Version.BASE ).
+ setMessage( message ) );
throw problems.newModelBuildingException();
}
@@ -373,24 +377,34 @@ public class DefaultModelBuilder
problems.setSource( inputModel );
checkPluginVersions( lineage, request, problems );
- // inheritance assembly
- assembleInheritance( lineage, request, problems );
+ // [MNG-4052] import scope dependencies prefer to download pom rather than find it in the current project
+ // [MNG-5971] Imported dependencies should be available to inheritance processing
+ //
+ // This first phase of model building is used for building models holding just enough information to map
+ // groupId:artifactId:version to pom files and to provide modules to build. For this, inheritance and
+ // interpolation needs to be performed. A temporary model is built in phase 1 applying inheritance and
+ // interpolation to fill in those values but is not returned. The rest of the model building takes place in
+ // phase 2.
+ final DefaultModelProblemCollector intermediateProblems = new DefaultModelProblemCollector( result );
+ final List<Model> intermediateLineage = new ArrayList<>( lineage.size() );
+ for ( final ModelData modelData : lineage )
+ {
+ intermediateLineage.add( modelData.getModel().clone() );
+ }
+ assembleInheritance( intermediateLineage, request, intermediateProblems );
+
+ Model intermediateModel = intermediateLineage.get( 0 );
+ intermediateModel = interpolateModel( intermediateModel, request, intermediateProblems );
Model resultModel = resultData.getModel();
+ resultModel.setGroupId( intermediateModel.getGroupId() );
+ resultModel.setArtifactId( intermediateModel.getArtifactId() );
+ resultModel.setVersion( intermediateModel.getVersion() );
+
problems.setSource( resultModel );
problems.setRootModel( resultModel );
- // model interpolation
- resultModel = interpolateModel( resultModel, request, problems );
- resultData.setModel( resultModel );
-
- // url normalization
- modelUrlNormalizer.normalize( resultModel, request );
-
- // Now the fully interpolated model is available: reconfigure the resolver
- configureResolver( request.getModelResolver(), resultModel, problems, true );
-
resultData.setGroupId( resultModel.getGroupId() );
resultData.setArtifactId( resultModel.getArtifactId() );
resultData.setVersion( resultModel.getVersion() );
@@ -404,6 +418,7 @@ public class DefaultModelBuilder
result.addModelId( modelId );
result.setActivePomProfiles( modelId, currentData.getActiveProfiles() );
result.setRawModel( modelId, currentData.getRawModel() );
+ result.setEffectiveModel( modelId, currentData.getModel() );
}
if ( !request.isTwoPhaseBuilding() )
@@ -418,20 +433,40 @@ public class DefaultModelBuilder
public ModelBuildingResult build( ModelBuildingRequest request, ModelBuildingResult result )
throws ModelBuildingException
{
- return build( request, result, new LinkedHashSet<String>() );
- }
-
- private ModelBuildingResult build( ModelBuildingRequest request, ModelBuildingResult result,
- Collection<String> imports )
- throws ModelBuildingException
- {
// phase 2
Model resultModel = result.getEffectiveModel();
+ // Reset to on-disk values to not suppress any warnings from phase 1.
+ resultModel.setGroupId( result.getRawModel().getGroupId() );
+ resultModel.setArtifactId( result.getRawModel().getArtifactId() );
+ resultModel.setVersion( result.getRawModel().getVersion() );
+
DefaultModelProblemCollector problems = new DefaultModelProblemCollector( result );
problems.setSource( resultModel );
problems.setRootModel( resultModel );
+ final List<Model> lineage = new ArrayList<>( result.getModelIds().size() );
+
+ for ( final String modelId : result.getModelIds() )
+ {
+ lineage.add( result.getEffectiveModel( modelId ) );
+ }
+
+ // [MNG-5971] Imported dependencies should be available to inheritance processing
+ processImports( lineage, "include", "pom", request, problems );
+ problems.setSource( resultModel );
+
+ // inheritance assembly
+ assembleInheritance( lineage, request, problems );
+
+ resultModel = interpolateModel( resultModel, request, problems );
+
+ // url normalization
+ modelUrlNormalizer.normalize( resultModel, request );
+
+ // Now the fully interpolated model is available: reconfigure the resolver
+ configureResolver( request.getModelResolver(), resultModel, problems, true );
+
// model path translation
modelPathTranslator.alignToBaseDirectory( resultModel, resultModel.getProjectDirectory(), request );
@@ -451,8 +486,7 @@ public class DefaultModelBuilder
lifecycleBindingsInjector.injectLifecycleBindings( resultModel, request, problems );
}
- // dependency management import
- importDependencyManagement( resultModel, request, problems, imports );
+ this.importDependencyManagement( resultModel, "import", request, problems, new HashSet<String>() );
// dependency management injection
dependencyManagementInjector.injectManagement( resultModel, request, problems );
@@ -485,10 +519,13 @@ public class DefaultModelBuilder
@Override
public Result<? extends Model> buildRawModel( File pomFile, int validationLevel, boolean locationTracking )
{
- final ModelBuildingRequest request = new DefaultModelBuildingRequest().setValidationLevel( validationLevel )
- .setLocationTracking( locationTracking );
+ final ModelBuildingRequest request = new DefaultModelBuildingRequest().
+ setValidationLevel( validationLevel ).
+ setLocationTracking( locationTracking );
+
final DefaultModelProblemCollector collector =
new DefaultModelProblemCollector( new DefaultModelBuildingResult() );
+
try
{
return newResult( readModel( null, pomFile, request, collector ), collector.getProblems() );
@@ -553,15 +590,17 @@ public class DefaultModelBuilder
if ( pomFile != null )
{
- problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.V20 )
- .setMessage( "Malformed POM " + modelSource.getLocation() + ": " + e.getMessage() )
- .setException( e ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.V20 ).
+ setMessage( "Malformed POM " + modelSource.getLocation() + ": " + e.getMessage() ).
+ setException( e ) );
+
}
else
{
- problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V20 )
- .setMessage( "Malformed POM " + modelSource.getLocation() + ": " + e.getMessage() )
- .setException( e ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V20 ).
+ setMessage( "Malformed POM " + modelSource.getLocation() + ": " + e.getMessage() ).
+ setException( e ) );
+
}
}
@@ -573,14 +612,16 @@ public class DefaultModelBuilder
}
catch ( ModelParseException e )
{
- problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE )
- .setMessage( "Non-parseable POM " + modelSource.getLocation() + ": " + e.getMessage() )
- .setException( e ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE ).
+ setMessage( "Non-parseable POM " + modelSource.getLocation() + ": " + e.getMessage() ).
+ setException( e ) );
+
throw problems.newModelBuildingException();
}
catch ( IOException e )
{
String msg = e.getMessage();
+
if ( msg == null || msg.length() <= 0 )
{
// NOTE: There's java.nio.charset.MalformedInputException and sun.io.MalformedInputException
@@ -593,14 +634,18 @@ public class DefaultModelBuilder
msg = e.getClass().getSimpleName();
}
}
- problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE )
- .setMessage( "Non-readable POM " + modelSource.getLocation() + ": " + msg ).setException( e ) );
+
+ problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE ).
+ setMessage( "Non-readable POM " + modelSource.getLocation() + ": " + msg ).
+ setException( e ) );
+
throw problems.newModelBuildingException();
}
model.setPomFile( pomFile );
problems.setSource( model );
+
modelValidator.validateRawModel( model, request, problems );
if ( hasFatalErrors( problems ) )
@@ -649,9 +694,11 @@ public class DefaultModelBuilder
}
catch ( InvalidRepositoryException e )
{
- problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
- .setMessage( "Invalid repository " + repository.getId() + ": " + e.getMessage() )
- .setLocation( repository.getLocation( "" ) ).setException( e ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).
+ setMessage( "Invalid repository " + repository.getId() + ": " + e.getMessage() ).
+ setLocation( repository.getLocation( "" ) ).
+ setException( e ) );
+
}
}
}
@@ -703,21 +750,150 @@ public class DefaultModelBuilder
if ( versions.get( key ) == null && managedVersions.get( key ) == null )
{
InputLocation location = plugins.get( key ).getLocation( "" );
- problems
- .add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V20 )
- .setMessage( "'build.plugins.plugin.version' for " + key + " is missing." )
- .setLocation( location ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V20 ).
+ setMessage( "'build.plugins.plugin.version' for " + key + " is missing." ).
+ setLocation( location ) );
+
}
}
}
- private void assembleInheritance( List<ModelData> lineage, ModelBuildingRequest request,
+ private void processImports( final List<Model> lineage, final String scope, final String packaging,
+ final ModelBuildingRequest request, final DefaultModelProblemCollector problems )
+ {
+ // [MNG-5971] Imported dependencies should be available to inheritance processing
+ // It's not possible to support all ${project.xyz} properties in dependency management import declarations
+ // because import processing is performed before the final inheritance processing is performed. So the set of
+ // ${project.xyz} properties supported in dependency management import declarations is limited.
+
+ final List<Model> intermediateLineage = new ArrayList<>( lineage.size() );
+
+ for ( int i = 0, s0 = lineage.size(); i < s0; i++ )
+ {
+ intermediateLineage.add( lineage.get( i ).clone() );
+ }
+
+ for ( int i = intermediateLineage.size() - 2; i >= 0; i-- )
+ {
+ final Model parent = intermediateLineage.get( i + 1 );
+ final Model child = intermediateLineage.get( i );
+
+ if ( child.getGroupId() == null )
+ {
+ // Support ${project.groupId} in dependency management import declarations.
+ child.setGroupId( parent.getGroupId() );
+ }
+ if ( child.getVersion() == null )
+ {
+ // Support ${project.version} in dependency management import declarations.
+ child.setVersion( parent.getVersion() );
+ }
+
+ final Properties properties = new Properties();
+ properties.putAll( parent.getProperties() );
+ properties.putAll( child.getProperties() );
+ child.setProperties( properties );
+
+ final List<Repository> repositories = new ArrayList<>();
+ repositories.addAll( child.getRepositories() );
+
+ for ( final Repository parentRepository : parent.getRepositories() )
+ {
+ if ( !repositories.contains( parentRepository ) )
+ {
+ repositories.add( parentRepository );
+ }
+ }
+
+ child.setRepositories( repositories );
+ }
+
+ final Properties effectiveProperties = intermediateLineage.get( 0 ).getProperties();
+
+ final DefaultModelProblemCollector intermediateProblems =
+ new DefaultModelProblemCollector( new DefaultModelBuildingResult() );
+
+ // Interpolates the intermediate model.
+ // MNG-6079: Uses the effective properties of the result model to support property overriding.
+ for ( int i = 0, s0 = intermediateLineage.size(); i < s0; i++ )
+ {
+ final Model model = intermediateLineage.get( i );
+ model.setProperties( effectiveProperties );
+ intermediateProblems.setSource( model );
+ this.interpolateModel( model, request, intermediateProblems );
+ }
+
+ // Exchanges 'include' scope dependencies in the original lineage with possibly interpolated values.
+ for ( int i = 0, s0 = lineage.size(); i < s0; i++ )
+ {
+ final Model model = lineage.get( i );
+
+ if ( model.getDependencyManagement() != null )
+ {
+ for ( int j = 0, s1 = model.getDependencyManagement().getDependencies().size(); j < s1; j++ )
+ {
+ final Dependency dependency = model.getDependencyManagement().getDependencies().get( j );
+
+ if ( scope.equals( dependency.getScope() ) && packaging.equals( dependency.getType() ) )
+ {
+ final Dependency interpolated =
+ intermediateLineage.get( i ).getDependencyManagement().getDependencies().get( j );
+
+ model.getDependencyManagement().getDependencies().set( j, interpolated );
+ }
+ }
+ }
+ }
+
+ // [MNG-4488] [regression] Parent POMs resolved from repository are validated in strict mode
+ ModelBuildingRequest lenientRequest = request;
+ if ( request.getValidationLevel() > ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 )
+ {
+ lenientRequest = new FilterModelBuildingRequest( request )
+ {
+
+ @Override
+ public int getValidationLevel()
+ {
+ return ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0;
+ }
+
+ };
+ }
+
+ // Sets up the resolver to use the effective repositories to support repository overriding.
+ if ( lenientRequest.getModelResolver() != null )
+ {
+ for ( Repository repository : intermediateLineage.get( 0 ).getRepositories() )
+ {
+ try
+ {
+ lenientRequest.getModelResolver().addRepository( repository, true );
+ }
+ catch ( InvalidRepositoryException e )
+ {
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
+ .setMessage( "Invalid repository " + repository.getId() + ": " + e.getMessage() )
+ .setLocation( repository.getLocation( "" ) ).setException( e ) );
+
+ }
+ }
+ }
+
+ // Imports dependencies into the original model using the effective repositories.
+ for ( int i = 0, s0 = lineage.size(); i < s0; i++ )
+ {
+ this.importDependencyManagement( lineage.get( i ), scope, lenientRequest, problems, new HashSet<String>() );
+ }
+ }
+
+ private void assembleInheritance( List<Model> lineage, ModelBuildingRequest request,
ModelProblemCollector problems )
{
for ( int i = lineage.size() - 2; i >= 0; i-- )
{
- Model parent = lineage.get( i + 1 ).getModel();
- Model child = lineage.get( i ).getModel();
+ Model parent = lineage.get( i + 1 );
+ Model child = lineage.get( i );
inheritanceAssembler.assembleModelInheritance( child, parent, request, problems );
}
}
@@ -817,7 +993,7 @@ public class DefaultModelBuilder
ModelSource expectedParentSource = getParentPomFile( childModel, childSource );
if ( expectedParentSource instanceof ModelSource2
- && !pomFile.toURI().equals( ( (ModelSource2) expectedParentSource ).getLocationURI() ) )
+ && !pomFile.toURI().equals( ( (ModelSource2) expectedParentSource ).getLocationURI() ) )
{
parentData = readParentExternally( childModel, request, problems );
}
@@ -828,10 +1004,11 @@ public class DefaultModelBuilder
if ( !"pom".equals( parentModel.getPackaging() ) )
{
- problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
- .setMessage( "Invalid packaging for parent POM " + ModelProblemUtils.toSourceHint( parentModel )
- + ", must be \"pom\" but is \"" + parentModel.getPackaging() + "\"" )
- .setLocation( parentModel.getLocation( "packaging" ) ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).
+ setMessage( "Invalid packaging for parent POM " + ModelProblemUtils.toSourceHint( parentModel )
+ + ", must be \"pom\" but is \"" + parentModel.getPackaging() + "\"" ).
+ setLocation( parentModel.getLocation( "packaging" ) ) );
+
}
}
else
@@ -873,11 +1050,15 @@ public class DefaultModelBuilder
{
candidateModel =
resolver.resolveRawModel( parent.getGroupId(), parent.getArtifactId(), parent.getVersion() );
+
}
catch ( UnresolvableModelException e )
{
- problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE ) //
- .setMessage( e.getMessage().toString() ).setLocation( parent.getLocation( "" ) ).setException( e ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE ).
+ setMessage( e.getMessage().toString() ).
+ setLocation( parent.getLocation( "" ) ).
+ setException( e ) );
+
throw problems.newModelBuildingException();
}
if ( candidateModel == null )
@@ -892,7 +1073,6 @@ public class DefaultModelBuilder
// have a model that is suitable, yet more checks are done here and the one for the version is problematic
// before because with parents as ranges it will never work in this scenario.
//
-
String groupId = candidateModel.getGroupId();
if ( groupId == null && candidateModel.getParent() != null )
{
@@ -906,7 +1086,7 @@ public class DefaultModelBuilder
}
if ( groupId == null || !groupId.equals( parent.getGroupId() ) || artifactId == null
- || !artifactId.equals( parent.getArtifactId() ) )
+ || !artifactId.equals( parent.getArtifactId() ) )
{
StringBuilder buffer = new StringBuilder( 256 );
buffer.append( "'parent.relativePath'" );
@@ -919,8 +1099,10 @@ public class DefaultModelBuilder
buffer.append( parent.getArtifactId() ).append( ", please verify your project structure" );
problems.setSource( childModel );
- problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.BASE )
- .setMessage( buffer.toString() ).setLocation( parent.getLocation( "" ) ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.BASE ).
+ setMessage( buffer.toString() ).
+ setLocation( parent.getLocation( "" ) ) );
+
return null;
}
if ( version != null && parent.getVersion() != null && !version.equals( parent.getVersion() ) )
@@ -976,7 +1158,6 @@ public class DefaultModelBuilder
/*
* if ( version == null || !version.equals( parent.getVersion() ) ) { return null; }
*/
-
ModelData parentData = new ModelData( candidateSource, candidateModel, groupId, artifactId, version );
return parentData;
@@ -1014,7 +1195,8 @@ public class DefaultModelBuilder
ModelResolver modelResolver = request.getModelResolver();
Validate.notNull( modelResolver, "request.modelResolver cannot be null (parent POM %s and POM %s)",
- ModelProblemUtils.toId( groupId, artifactId, version ), ModelProblemUtils.toSourceHint( childModel ) );
+ ModelProblemUtils.toId( groupId, artifactId, version ),
+ ModelProblemUtils.toSourceHint( childModel ) );
ModelSource modelSource;
try
@@ -1047,8 +1229,11 @@ public class DefaultModelBuilder
}
}
- problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE )
- .setMessage( buffer.toString() ).setLocation( parent.getLocation( "" ) ).setException( e ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE ).
+ setMessage( buffer.toString() ).
+ setLocation( parent.getLocation( "" ) ).
+ setException( e ) );
+
throw problems.newModelBuildingException();
}
@@ -1057,11 +1242,13 @@ public class DefaultModelBuilder
{
lenientRequest = new FilterModelBuildingRequest( request )
{
+
@Override
public int getValidationLevel()
{
return ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0;
}
+
};
}
@@ -1072,8 +1259,9 @@ public class DefaultModelBuilder
if ( childModel.getVersion() == null )
{
// Message below is checked for in the MNG-2199 core IT.
- problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.V31 )
- .setMessage( "Version must be a constant" ).setLocation( childModel.getLocation( "" ) ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.V31 ).
+ setMessage( "Version must be a constant" ).
+ setLocation( childModel.getLocation( "" ) ) );
}
else
@@ -1081,9 +1269,9 @@ public class DefaultModelBuilder
if ( childModel.getVersion().contains( "${" ) )
{
// Message below is checked for in the MNG-2199 core IT.
- problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.V31 )
- .setMessage( "Version must be a constant" )
- .setLocation( childModel.getLocation( "version" ) ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.V31 ).
+ setMessage( "Version must be a constant" ).
+ setLocation( childModel.getLocation( "version" ) ) );
}
}
@@ -1102,7 +1290,7 @@ public class DefaultModelBuilder
return superPomProvider.getSuperModel( "4.0.0" ).clone();
}
- private void importDependencyManagement( Model model, ModelBuildingRequest request,
+ private void importDependencyManagement( Model model, String scope, ModelBuildingRequest request,
DefaultModelProblemCollector problems, Collection<String> importIds )
{
DependencyManagement depMgmt = model.getDependencyManagement();
@@ -1112,6 +1300,8 @@ public class DefaultModelBuilder
return;
}
+ problems.setSource( model );
+
String importing = model.getGroupId() + ':' + model.getArtifactId() + ':' + model.getVersion();
importIds.add( importing );
@@ -1125,7 +1315,7 @@ public class DefaultModelBuilder
{
Dependency dependency = it.next();
- if ( !"pom".equals( dependency.getType() ) || !"import".equals( dependency.getScope() ) )
+ if ( !"pom".equals( dependency.getType() ) || !scope.equals( dependency.getScope() ) )
{
continue;
}
@@ -1146,18 +1336,20 @@ public class DefaultModelBuilder
}
if ( artifactId == null || artifactId.length() <= 0 )
{
- problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
- .setMessage( "'dependencyManagement.dependencies.dependency.artifactId' for "
- + dependency.getManagementKey() + " is missing." )
- .setLocation( dependency.getLocation( "" ) ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).
+ setMessage( "'dependencyManagement.dependencies.dependency.artifactId' for "
+ + dependency.getManagementKey() + " is missing." ).
+ setLocation( dependency.getLocation( "" ) ) );
+
continue;
}
if ( version == null || version.length() <= 0 )
{
- problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
- .setMessage( "'dependencyManagement.dependencies.dependency.version' for "
- + dependency.getManagementKey() + " is missing." )
- .setLocation( dependency.getLocation( "" ) ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).
+ setMessage( "'dependencyManagement.dependencies.dependency.version' for "
+ + dependency.getManagementKey() + " is missing." ).
+ setLocation( dependency.getLocation( "" ) ) );
+
continue;
}
@@ -1165,14 +1357,13 @@ public class DefaultModelBuilder
if ( importIds.contains( imported ) )
{
- String message = "The dependencies of type=pom and with scope=import form a cycle: ";
+ String message = "The dependencies of type=pom and scope=" + scope + " form a cycle: ";
for ( String modelId : importIds )
{
message += modelId + " -> ";
}
message += imported;
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).setMessage( message ) );
-
continue;
}
@@ -1185,9 +1376,10 @@ public class DefaultModelBuilder
{
throw new NullPointerException( String.format(
"request.workspaceModelResolver and request.modelResolver cannot be null"
- + " (parent POM %s and POM %s)",
+ + " (parent POM %s and POM %s)",
ModelProblemUtils.toId( groupId, artifactId, version ),
ModelProblemUtils.toSourceHint( model ) ) );
+
}
Model importModel = null;
@@ -1199,8 +1391,10 @@ public class DefaultModelBuilder
}
catch ( UnresolvableModelException e )
{
- problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE )
- .setMessage( e.getMessage().toString() ).setException( e ) );
+ problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE ).
+ setMessage( e.getMessage().toString() ).
+ setException( e ) );
+
continue;
}
}
@@ -1434,9 +1628,11 @@ public class DefaultModelBuilder
private boolean containsCoordinates( String message, String groupId, String artifactId, String version )
{
- return message != null && ( groupId == null || message.contains( groupId ) )
- && ( artifactId == null || message.contains( artifactId ) )
- && ( version == null || message.contains( version ) );
+ return message != null
+ && ( groupId == null || message.contains( groupId ) )
+ && ( artifactId == null || message.contains( artifactId ) )
+ && ( version == null || message.contains( version ) );
+
}
protected boolean hasModelErrors( ModelProblemCollectorExt problems )
http://git-wip-us.apache.org/repos/asf/maven/blob/3f218a60/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
index 7bf45b5..fe1c7ae 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java
@@ -39,11 +39,13 @@ class DefaultModelBuildingResult
private Model effectiveModel;
- private List<String> modelIds;
+ private final List<String> modelIds;
- private Map<String, Model> rawModels;
+ private final Map<String, Model> rawModels;
- private Map<String, List<Profile>> activePomProfiles;
+ private final Map<String, Model> effectiveModels;
+
+ private final Map<String, List<Profile>> activePomProfiles;
private List<Profile> activeExternalProfiles;
@@ -56,6 +58,7 @@ class DefaultModelBuildingResult
activePomProfiles = new HashMap<>();
activeExternalProfiles = new ArrayList<>();
problems = new ArrayList<>();
+ effectiveModels = new HashMap<>();
}
@Override
@@ -110,6 +113,23 @@ class DefaultModelBuildingResult
}
@Override
+ public Model getEffectiveModel( final String modelId )
+ {
+ return this.effectiveModels.get( modelId );
+ }
+
+ public DefaultModelBuildingResult setEffectiveModel( final String modelId, final Model model )
+ {
+ // Intentionally notNull because Super POM may not contain a modelId
+ Validate.notNull( modelId, "modelId must not be null" );
+ Validate.notNull( model, "model must not be null" );
+
+ this.effectiveModels.put( modelId, model );
+
+ return this;
+ }
+
+ @Override
public List<Profile> getActivePomProfiles( String modelId )
{
return activePomProfiles.get( modelId );
http://git-wip-us.apache.org/repos/asf/maven/blob/3f218a60/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java
index 44b1295..b21a670 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java
@@ -69,6 +69,18 @@ public interface ModelBuildingResult
Model getRawModel( String modelId );
/**
+ * Gets the effective model for a given identifier. The model identifier should be from the collection obtained by
+ * {@link #getModelIds()}. As a special case, an empty string can be used as the identifier for the super POM.
+ *
+ * @param modelId The identifier of the desired effective model, must not be {@code null}.
+ *
+ * @return The effective model or {@code null} if the specified model id does not refer to a known model.
+ *
+ * @since 3.6
+ */
+ Model getEffectiveModel( String modelId );
+
+ /**
* Gets the profiles from the specified model that were active during model building. The model identifier should be
* from the collection obtained by {@link #getModelIds()}. As a special case, an empty string can be used as the
* identifier for the super POM.
http://git-wip-us.apache.org/repos/asf/maven/blob/3f218a60/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
index cce7d7f..b8caaa7 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
@@ -20,15 +20,20 @@ package org.apache.maven.model.composition;
*/
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.Exclusion;
+import org.apache.maven.model.InputLocation;
+import org.apache.maven.model.InputSource;
import org.apache.maven.model.Model;
import org.apache.maven.model.building.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblemCollector;
+import org.apache.maven.model.building.ModelProblemCollectorRequest;
import org.codehaus.plexus.component.annotations.Component;
/**
@@ -42,41 +47,215 @@ public class DefaultDependencyManagementImporter
{
@Override
- public void importManagement( Model target, List<? extends DependencyManagement> sources,
- ModelBuildingRequest request, ModelProblemCollector problems )
+ public void importManagement( final Model target, final List<? extends DependencyManagement> sources,
+ final ModelBuildingRequest request, final ModelProblemCollector problems )
{
if ( sources != null && !sources.isEmpty() )
{
- Map<String, Dependency> dependencies = new LinkedHashMap<>();
+ final Map<String, Dependency> targetDependencies = new LinkedHashMap<>();
+ final DependencyManagement targetDependencyManagement = target.getDependencyManagement() != null
+ ? target.getDependencyManagement()
+ : new DependencyManagement();
+
+ target.setDependencyManagement( targetDependencyManagement );
+
+ for ( final Dependency targetDependency : targetDependencyManagement.getDependencies() )
+ {
+ targetDependencies.put( targetDependency.getManagementKey(), targetDependency );
+ }
- DependencyManagement depMgmt = target.getDependencyManagement();
+ final Map<String, List<Dependency>> sourceDependencies = new LinkedHashMap<>();
- if ( depMgmt != null )
+ for ( final DependencyManagement source : sources )
{
- for ( Dependency dependency : depMgmt.getDependencies() )
+ for ( final Dependency sourceDependency : source.getDependencies() )
{
- dependencies.put( dependency.getManagementKey(), dependency );
+ if ( !targetDependencies.containsKey( sourceDependency.getManagementKey() ) )
+ {
+ List<Dependency> conflictCanditates =
+ sourceDependencies.get( sourceDependency.getManagementKey() );
+
+ if ( conflictCanditates == null )
+ {
+ conflictCanditates = new ArrayList<>( source.getDependencies().size() );
+ sourceDependencies.put( sourceDependency.getManagementKey(), conflictCanditates );
+ }
+
+ conflictCanditates.add( sourceDependency );
+ }
}
}
- else
+
+ for ( final List<Dependency> conflictCanditates : sourceDependencies.values() )
{
- depMgmt = new DependencyManagement();
- target.setDependencyManagement( depMgmt );
+ final List<Dependency> conflictingDependencies = removeRedundantDependencies( conflictCanditates );
+
+ // First declaration wins. This is what makes the conflict resolution indeterministic because this
+ // solely relies on the order of declaration. There is no such thing as the "first" declaration.
+ targetDependencyManagement.getDependencies().add( conflictingDependencies.get( 0 ) );
+
+ // As of Maven 3.6, we print a warning about such conflicting imports using validation level Maven 3.1.
+ if ( conflictingDependencies.size() > 1 )
+ {
+ final StringBuilder conflictsBuilder = new StringBuilder( conflictingDependencies.size() * 128 );
+
+ for ( final Dependency dependency : conflictingDependencies )
+ {
+ final InputLocation location = dependency.getLocation( "" );
+
+ if ( location != null )
+ {
+ final InputSource inputSource = location.getSource();
+
+ if ( inputSource != null )
+ {
+ conflictsBuilder.append( ", '" ).append( inputSource.getModelId() ).append( '\'' );
+ }
+ }
+ }
+
+ problems.add( new ModelProblemCollectorRequest(
+ effectiveSeverity( request.getValidationLevel(),
+ ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 ),
+ ModelProblem.Version.V20 ).
+ setMessage( String.format(
+ "Dependency '%1$s' has conflicting dependency management in model '%2$s'%3$s%4$s. "
+ + "To resolve the conflicts, declare the dependency management for dependency '%1$s' "
+ + "directly in the dependency management of model '%2$s' to override what gets "
+ + "imported. If the Maven version in use supports it, add exclusions for the "
+ + "conflicting dependencies or use the include scope feature to rearrange the "
+ + "causing dependencies in the inheritance hierarchy applying standard override logic "
+ + "based on artifact coordinates. Without resolving the conflicts, your build relies "
+ + "on indeterministic behaviour.",
+ conflictingDependencies.get( 0 ).getManagementKey(), target.getId(),
+ target.getPomFile() != null
+ ? " @ '" + target.getPomFile().getAbsolutePath() + "' "
+ : " ", conflictsBuilder.length() > 0
+ ? "(" + conflictsBuilder.substring( 2 ) + ")"
+ : "" ) ) );
+
+ }
}
+ }
+ }
+
+ private static List<Dependency> removeRedundantDependencies( final List<Dependency> candidateDependencies )
+ {
+ final List<Dependency> resultDependencies = new ArrayList<>( candidateDependencies.size() );
- for ( DependencyManagement source : sources )
+ while ( !candidateDependencies.isEmpty() )
+ {
+ final Dependency resultDependency = candidateDependencies.remove( 0 );
+ resultDependencies.add( resultDependency );
+
+ // Removes redundant dependencies.
+ for ( final Iterator<Dependency> it = candidateDependencies.iterator(); it.hasNext(); )
{
- for ( Dependency dependency : source.getDependencies() )
+ final Dependency candidateDependency = it.next();
+ boolean redundant = true;
+
+ redundancy_check:
{
- String key = dependency.getManagementKey();
- if ( !dependencies.containsKey( key ) )
+ if ( !( resultDependency.getOptional() != null
+ ? resultDependency.getOptional().equals( candidateDependency.getOptional() )
+ : candidateDependency.getOptional() == null ) )
+ {
+ redundant = false;
+ break redundancy_check;
+ }
+
+ if ( !( effectiveScope( resultDependency ).equals( effectiveScope( candidateDependency ) ) ) )
+ {
+ redundant = false;
+ break redundancy_check;
+ }
+
+ if ( !( resultDependency.getSystemPath() != null
+ ? resultDependency.getSystemPath().equals( candidateDependency.getSystemPath() )
+ : candidateDependency.getSystemPath() == null ) )
{
- dependencies.put( key, dependency );
+ redundant = false;
+ break redundancy_check;
}
+
+ if ( !( resultDependency.getVersion() != null
+ ? resultDependency.getVersion().equals( candidateDependency.getVersion() )
+ : candidateDependency.getVersion() == null ) )
+ {
+ redundant = false;
+ break redundancy_check;
+ }
+
+ for ( int i = 0, s0 = resultDependency.getExclusions().size(); i < s0; i++ )
+ {
+ final Exclusion resultExclusion = resultDependency.getExclusions().get( i );
+
+ if ( !containsExclusion( candidateDependency.getExclusions(), resultExclusion ) )
+ {
+ redundant = false;
+ break redundancy_check;
+ }
+ }
+
+ for ( int i = 0, s0 = candidateDependency.getExclusions().size(); i < s0; i++ )
+ {
+ final Exclusion candidateExclusion = candidateDependency.getExclusions().get( i );
+
+ if ( !containsExclusion( resultDependency.getExclusions(), candidateExclusion ) )
+ {
+ redundant = false;
+ break redundancy_check;
+ }
+ }
+ }
+
+ if ( redundant )
+ {
+ it.remove();
}
}
+ }
+
+ return resultDependencies;
+ }
+
+ private static boolean containsExclusion( final List<Exclusion> exclusions, final Exclusion exclusion )
+ {
+ for ( int i = 0, s0 = exclusions.size(); i < s0; i++ )
+ {
+ final Exclusion current = exclusions.get( i );
+
+ if ( ( exclusion.getArtifactId() != null
+ ? exclusion.getArtifactId().equals( current.getArtifactId() )
+ : current.getArtifactId() == null )
+ && ( exclusion.getGroupId() != null
+ ? exclusion.getGroupId().equals( current.getGroupId() )
+ : current.getGroupId() == null ) )
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
- depMgmt.setDependencies( new ArrayList<>( dependencies.values() ) );
+ private static String effectiveScope( final Dependency dependency )
+ {
+ return dependency.getScope() == null
+ ? "compile"
+ : dependency.getScope();
+
+ }
+
+ private static ModelProblem.Severity effectiveSeverity( final int validationLevel, final int errorThreshold )
+ {
+ if ( validationLevel < errorThreshold )
+ {
+ return ModelProblem.Severity.WARNING;
+ }
+ else
+ {
+ return ModelProblem.Severity.ERROR;
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/3f218a60/maven-model-builder/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/site/apt/index.apt b/maven-model-builder/src/site/apt/index.apt
index a14b4e3..9b6c841 100644
--- a/maven-model-builder/src/site/apt/index.apt
+++ b/maven-model-builder/src/site/apt/index.apt
@@ -57,6 +57,12 @@ Maven Model Builder
** parent resolution until {{{./super-pom.html}super-pom}}
+ []
+
+ * phase 2, with optional plugin processing
+
+ ** dependency management include processing (for dependencies of type <<<pom>>> and scope <<<include>>> in the <<<\<dependencyManagement\>>>> section)
+
** inheritance assembly (see {{{./index.html#Inheritance_Assembly}below}})
** model interpolation (see {{{./index.html#Model_Interpolation}below}})
@@ -65,10 +71,6 @@ Maven Model Builder
with its <<<DefaultUrlNormalizer>>> implementation
({{{./xref/org/apache/maven/model/path/DefaultUrlNormalizer.html}source}})
- []
-
- * phase 2, with optional plugin processing
-
** model path translation: <<<ModelPathTranslator>>> ({{{./apidocs/org/apache/maven/model/path/ModelPathTranslator.html}javadoc}}),
with its <<<DefaultModelPathTranslator>>> implementation
({{{./xref/org/apache/maven/model/path/DefaultModelPathTranslator.html}source}})
@@ -81,7 +83,7 @@ Maven Model Builder
with its <<<DefaultLifecycleBindingsInjector>>> implementation
({{{./xref/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.html}source}})
- ** dependency management import (for dependencies of type <<<pom>>> in the <<<\<dependencyManagement\>>>> section)
+ ** dependency management import processing (for dependencies of type <<<pom>>> and scope <<<import>>> in the <<<\<dependencyManagement\>>>> section)
** dependency management injection: <<<DependencyManagementInjector>>> ({{{./apidocs/org/apache/maven/model/management/DependencyManagementInjector.html}javadoc}}),
with its <<<DefaultDependencyManagementInjector>>> implementation
[11/15] maven git commit: o Updated to Maven Resolver 1.2.0-SNAPSHOT.
Posted by sc...@apache.org.
o Updated to Maven Resolver 1.2.0-SNAPSHOT.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a98321ea
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a98321ea
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a98321ea
Branch: refs/heads/DEPMGMT
Commit: a98321ea9e420e83f223b542f2aeb3fcd9e69c54
Parents: cdb327d
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Jan 31 20:22:42 2017 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:41:23 2017 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/a98321ea/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 45fe5d1..868841a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@ under the License.
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.8.3</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <resolverVersion>1.0.3</resolverVersion>
+ <resolverVersion>1.2.0-SNAPSHOT</resolverVersion>
<slf4jVersion>1.7.22</slf4jVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
[15/15] maven git commit: [MNG-5935] Optional true getting lost in
managed dependencies when transitive
Posted by sc...@apache.org.
[MNG-5935] Optional true getting lost in managed dependencies when transitive
Updated to correctly map the optional flag of Maven model dependencies to
Aether dependencies. Prior to this change all managed dependencies implicitly
had the optional flag set to 'false' leading to Aether managing that flag to
'false' on all managed dependencies when transitive.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3cab133a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3cab133a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3cab133a
Branch: refs/heads/DEPMGMT
Commit: 3cab133a9b8b9d3f0bdd90c9b6c9d6a5ab56abd6
Parents: ded79ab
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Feb 11 08:45:19 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:41:23 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/RepositoryUtils.java | 7 ++++++-
.../repository/internal/ArtifactDescriptorReaderDelegate.java | 6 +++++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/3cab133a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 86eab4e..52442b7 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -316,7 +316,12 @@ public class RepositoryUtils
exclusions.add( toExclusion( exclusion ) );
}
- Dependency result = new Dependency( artifact, dependency.getScope(), dependency.isOptional(), exclusions );
+ Dependency result = new Dependency( artifact,
+ dependency.getScope(),
+ dependency.getOptional() != null
+ ? dependency.isOptional()
+ : null,
+ exclusions );
return result;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/3cab133a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
index 53c0475..a5e2ffd 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
@@ -124,7 +124,11 @@ public class ArtifactDescriptorReaderDelegate
exclusions.add( convert( exclusion ) );
}
- Dependency result = new Dependency( artifact, dependency.getScope(), dependency.isOptional(), exclusions );
+ Dependency result = new Dependency( artifact, dependency.getScope(),
+ dependency.getOptional() != null
+ ? dependency.isOptional()
+ : null,
+ exclusions );
return result;
}
[14/15] maven git commit: [MNG-5227] The 'optional' flag of a
dependency should be manageable.
Posted by sc...@apache.org.
[MNG-5227] The 'optional' flag of a dependency should be manageable.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ded79ab0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ded79ab0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ded79ab0
Branch: refs/heads/DEPMGMT
Commit: ded79ab0c8cbabb1942d5ba0efb2cf8d06e1cd77
Parents: a98321e
Author: Christian Schulte <sc...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 19:41:23 2017 +0100
----------------------------------------------------------------------
.../model/management/DefaultDependencyManagementInjector.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ded79ab0/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
index e611973..731cdd8 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
@@ -82,13 +82,6 @@ public class DefaultDependencyManagementInjector
}
@Override
- protected void mergeDependency_Optional( Dependency target, Dependency source, boolean sourceDominant,
- Map<Object, Object> context )
- {
- // optional flag is not managed
- }
-
- @Override
protected void mergeDependency_Exclusions( Dependency target, Dependency source, boolean sourceDominant,
Map<Object, Object> context )
{