[MNG-5527] Dependency management import should support relocations. o Updated to remove the system property controlling the feature. As of Maven 3.4.0, dependency management import relocations will be supported.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ef4e4b4d Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ef4e4b4d Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ef4e4b4d Branch: refs/heads/master Commit: ef4e4b4d826d60527dc8372501fbef9e3dcaf648 Parents: 3bec6b9 Author: Christian Schulte <schu...@apache.org> Authored: Sat Dec 10 19:41:23 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Sat Dec 10 19:42:16 2016 +0100 ---------------------------------------------------------------------- .../apache/maven/model/building/DefaultModelBuilder.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/ef4e4b4d/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 e55f732..27d24f3 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 @@ -157,10 +157,12 @@ public class DefaultModelBuilder */ private static final boolean DEPENDENCY_MANAGEMENT_IMPORT_EXCLUSIONS = true; - // [MNG-5527] Dependency management import should support relocations. - private static final boolean DEPENDENCY_MANAGEMENT_IMPORT_RELOCATIONS = - System.getProperty( DefaultModelBuilder.class.getName() - + ".disableDependencyManagementImportRelocations" ) == null; + /** + * [MNG-5527] Dependency management import should support relocations. + * + * @since 3.4.0 + */ + private static final boolean DEPENDENCY_MANAGEMENT_IMPORT_RELOCATIONS = true; // [MNG-5971] Imported dependencies should be available to inheritance processing. private static final boolean DEPENDENCY_MANAGEMENT_IMPORT_INHERITANCE_PROCESSING =
