You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/26 19:43:50 UTC
svn commit: r797961 - in /maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model: building/ composition/ management/

Author: bentmann
Date: Sun Jul 26 17:43:50 2009
New Revision: 797961

URL: http://svn.apache.org/viewvc?rev=797961&view=rev
Log:
o Moved dependency management importer into package dedicated to mixin composition

Added:
    maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/composition/
    maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
      - copied, changed from r797873, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementImporter.java
    maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java
      - copied, changed from r797873, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementImporter.java
Removed:
    maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementImporter.java
    maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementImporter.java
Modified:
    maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java

Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=797961&r1=797960&r2=797961&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Sun Jul 26 17:43:50 2009
@@ -33,12 +33,12 @@
 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;

Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java (from r797873, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementImporter.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementImporter.java&r1=797873&r2=797961&rev=797961&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementImporter.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java Sun Jul 26 17:43:50 2009
@@ -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

Copied: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java (from r797873, maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementImporter.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java?p2=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java&p1=maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementImporter.java&r1=797873&r2=797961&rev=797961&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementImporter.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java Sun Jul 26 17:43:50 2009
@@ -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