From 70f22200a03ed18545b27295c1469014f2616139 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Sun, 26 Jul 2009 17:43:50 +0000 Subject: [PATCH] o Moved dependency management importer into package dedicated to mixin composition git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797961 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/model/building/DefaultModelBuilder.java | 2 +- .../DefaultDependencyManagementImporter.java | 2 +- .../DependencyManagementImporter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename maven-model-builder/src/main/java/org/apache/maven/model/{management => composition}/DefaultDependencyManagementImporter.java (98%) rename maven-model-builder/src/main/java/org/apache/maven/model/{management => composition}/DependencyManagementImporter.java (97%) 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 4649d124d2..15a3d540f6 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 @@ -33,12 +33,12 @@ import org.apache.maven.model.Model; import org.apache.maven.model.Parent; import org.apache.maven.model.Profile; import org.apache.maven.model.Repository; +import org.apache.maven.model.composition.DependencyManagementImporter; import org.apache.maven.model.inheritance.InheritanceAssembler; import org.apache.maven.model.interpolation.ModelInterpolationException; import org.apache.maven.model.interpolation.ModelInterpolator; import org.apache.maven.model.io.ModelParseException; import org.apache.maven.model.io.ModelReader; -import org.apache.maven.model.management.DependencyManagementImporter; import org.apache.maven.model.management.DependencyManagementInjector; import org.apache.maven.model.management.PluginManagementInjector; import org.apache.maven.model.normalization.ModelNormalizer; diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementImporter.java b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java similarity index 98% rename from maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementImporter.java rename to maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java index 741ea201dd..f31f3d0ba5 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementImporter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.model.management; +package org.apache.maven.model.composition; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementImporter.java b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java similarity index 97% rename from maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementImporter.java rename to maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java index 7eedb2ff7b..d8b4aae890 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementImporter.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java @@ -1,4 +1,4 @@ -package org.apache.maven.model.management; +package org.apache.maven.model.composition; /* * Licensed to the Apache Software Foundation (ASF) under one