Updated Branches: refs/heads/master a07fdf076 -> 915b1553f
changed MavenModelMerger extensions visibility to protected to improve documentation Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/915b1553 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/915b1553 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/915b1553 Branch: refs/heads/master Commit: 915b1553f205bbad876e736871767be2c6a5ab99 Parents: a07fdf0 Author: Hervé Boutemy <[email protected]> Authored: Sat Dec 15 21:12:22 2012 +0100 Committer: Hervé Boutemy <[email protected]> Committed: Sat Dec 15 21:12:22 2012 +0100 ---------------------------------------------------------------------- .../plugin/DefaultLifecycleBindingsInjector.java | 2 +- .../inheritance/DefaultInheritanceAssembler.java | 2 +- .../DefaultDependencyManagementInjector.java | 2 +- .../DefaultPluginManagementInjector.java | 2 +- .../normalization/DefaultModelNormalizer.java | 2 +- .../model/profile/DefaultProfileInjector.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/915b1553/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java index 5cb3363..46aeb0b 100644 --- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java +++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java @@ -80,7 +80,7 @@ public class DefaultLifecycleBindingsInjector } } - private static class LifecycleBindingsMerger + protected static class LifecycleBindingsMerger extends MavenModelMerger { http://git-wip-us.apache.org/repos/asf/maven/blob/915b1553/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java index 92f4405..01ff9d7 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java @@ -124,7 +124,7 @@ public class DefaultInheritanceAssembler return adjustment; } - private static class InheritanceModelMerger + protected static class InheritanceModelMerger extends MavenModelMerger { http://git-wip-us.apache.org/repos/asf/maven/blob/915b1553/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 fbfd4b8..a13dcca 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 @@ -50,7 +50,7 @@ public class DefaultDependencyManagementInjector merger.mergeManagedDependencies( model ); } - private static class ManagementModelMerger + protected static class ManagementModelMerger extends MavenModelMerger { http://git-wip-us.apache.org/repos/asf/maven/blob/915b1553/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java index 1d5809d..ba9f060 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java @@ -53,7 +53,7 @@ public class DefaultPluginManagementInjector merger.mergeManagedBuildPlugins( model ); } - private static class ManagementModelMerger + protected static class ManagementModelMerger extends MavenModelMerger { http://git-wip-us.apache.org/repos/asf/maven/blob/915b1553/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java index df7ae5b..9163286 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java @@ -93,7 +93,7 @@ public class DefaultModelNormalizer } } - private static class DuplicateMerger + protected static class DuplicateMerger extends MavenModelMerger { http://git-wip-us.apache.org/repos/asf/maven/blob/915b1553/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java index b7c8b19..38421bc 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java @@ -71,7 +71,7 @@ public class DefaultProfileInjector } } - private static class ProfileModelMerger + protected static class ProfileModelMerger extends MavenModelMerger {
