[MNG-5600] Dependency management import should support exclusions. o Updated to remove the system property controlling the feature. As of Maven 3.4.0, dependency management import exclusions 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/3bec6b92 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3bec6b92 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3bec6b92 Branch: refs/heads/master Commit: 3bec6b92ff0c610cd15ef4458177d5a33ddc22d3 Parents: 94eef81 Author: Christian Schulte <schu...@apache.org> Authored: Sat Dec 10 19:39:40 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/3bec6b92/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 3a58feb..e55f732 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 @@ -150,10 +150,12 @@ public class DefaultModelBuilder */ private static final boolean DEPENDENCY_MANAGEMENT_IMPORT_VERSION_RANGES = true; - // [MNG-5600] Dependency management import should support exclusions. - private static final boolean DEPENDENCY_MANAGEMENT_IMPORT_EXCLUSIONS = - System.getProperty( DefaultModelBuilder.class.getName() - + ".disableDependencyManagementImportExclusions" ) == null; + /** + * [MNG-5600] Dependency management import should support exclusions. + * + * @since 3.4.0 + */ + 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 =
