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 2016/12/10 19:16:29 UTC
maven git commit: [MNG-5971] Imported dependencies should be
available to inheritance processing
Repository: maven
Updated Branches:
refs/heads/master 5785d6f1d -> 121d987a4
[MNG-5971] Imported dependencies should be available to inheritance processing
o Updated to restore legacy support of the 'import' scope feature.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/121d987a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/121d987a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/121d987a
Branch: refs/heads/master
Commit: 121d987a42df864445e297e99e97ea83415e7a38
Parents: 5785d6f
Author: Christian Schulte <sc...@apache.org>
Authored: Sat Dec 10 20:15:23 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Sat Dec 10 20:15:23 2016 +0100
----------------------------------------------------------------------
.../org/apache/maven/model/building/DefaultModelBuilder.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/121d987a/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 74f435b..24b314a 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
@@ -533,10 +533,7 @@ public class DefaultModelBuilder
lifecycleBindingsInjector.injectLifecycleBindings( resultModel, request, problems );
}
- if ( !DEPENDENCY_MANAGEMENT_IMPORT_INHERITANCE_PROCESSING )
- {
- this.importDependencyManagement( resultModel, "import", request, problems, new HashSet<String>() );
- }
+ this.importDependencyManagement( resultModel, "import", request, problems, new HashSet<String>() );
// dependency management injection
dependencyManagementInjector.injectManagement( resultModel, request, problems );