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/10/22 01:49:07 UTC
svn commit: r828259 - in /maven/maven-3/trunk/maven-core/src: main/java/org/apache/maven/ main/java/org/apache/maven/execution/ main/java/org/apache/maven/project/ test/java/org/apache/maven/execution/ test/java/org/apache/maven/plugin/

Author: bentmann
Date: Wed Oct 21 23:49:07 2009
New Revision: 828259

URL: http://svn.apache.org/viewvc?rev=828259&view=rev
Log:
o Restored backward-compat

Added:
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DuplicateProjectException.java
      - copied, changed from r827917, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
      - copied, changed from r827917, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java
Removed:
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java
Modified:
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependencyGraph.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
    maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java
    maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=828259&r1=828258&r2=828259&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Wed Oct 21 23:49:07 2009
@@ -31,21 +31,21 @@
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.execution.DefaultLifecycleEvent;
 import org.apache.maven.execution.DefaultMavenExecutionResult;
-import org.apache.maven.execution.DuplicateProjectException;
 import org.apache.maven.execution.ExecutionEvent;
 import org.apache.maven.execution.ExecutionListener;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionResult;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.execution.ProjectDependencyGraph;
-import org.apache.maven.execution.ProjectSorter;
 import org.apache.maven.lifecycle.LifecycleExecutor;
 import org.apache.maven.model.building.ModelProblem;
+import org.apache.maven.project.DuplicateProjectException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.project.ProjectBuildingResult;
+import org.apache.maven.project.ProjectSorter;
 import org.apache.maven.repository.DelegatingLocalArtifactRepository;
 import org.apache.maven.repository.LocalRepositoryNotAccessibleException;
 import org.codehaus.plexus.PlexusContainer;

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependencyGraph.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependencyGraph.java?rev=828259&r1=828258&r2=828259&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependencyGraph.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependencyGraph.java Wed Oct 21 23:49:07 2009
@@ -25,8 +25,8 @@
 import java.util.List;
 
 import org.apache.maven.execution.ProjectDependencyGraph;
-import org.apache.maven.execution.ProjectSorter;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectSorter;
 
 /**
  * Describes the inter-dependencies between projects in the reactor.

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java?rev=828259&r1=828258&r2=828259&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java Wed Oct 21 23:49:07 2009
@@ -22,7 +22,9 @@
 
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.project.DuplicateProjectException;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectSorter;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
 
 import java.util.ArrayList;

Copied: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DuplicateProjectException.java (from r827917, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DuplicateProjectException.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DuplicateProjectException.java&p1=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java&r1=827917&r2=828259&rev=828259&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DuplicateProjectException.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DuplicateProjectException.java Wed Oct 21 23:49:07 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.execution;
+package org.apache.maven.project;
 
 import java.io.File;
 

Copied: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java (from r827917, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java&p1=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java&r1=827917&r2=828259&rev=828259&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java Wed Oct 21 23:49:07 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.execution;
+package org.apache.maven.project;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,6 @@
  */
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -32,7 +31,6 @@
 import org.apache.maven.model.Extension;
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.Plugin;
-import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
 import org.codehaus.plexus.util.dag.DAG;
@@ -70,7 +68,7 @@
     // In this case, both the verify and the report goals are called
     // in a different lifecycle. Though the compiler-plugin has a valid usecase, although
     // that seems to work fine. We need to take versions and lifecycle into account.
-    public ProjectSorter( Collection<MavenProject> projects )
+    public ProjectSorter( List<MavenProject> projects )
         throws CycleDetectedException, DuplicateProjectException
     {
         dag = new DAG();

Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java?rev=828259&r1=828258&r2=828259&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java Wed Oct 21 23:49:07 2009
@@ -32,7 +32,9 @@
 import org.apache.maven.model.Parent;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginManagement;
+import org.apache.maven.project.DuplicateProjectException;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectSorter;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
 
 /**

Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java?rev=828259&r1=828258&r2=828259&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java Wed Oct 21 23:49:07 2009
@@ -36,13 +36,13 @@
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.DefaultMavenExecutionResult;
-import org.apache.maven.execution.DuplicateProjectException;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.project.DuplicateProjectException;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.MutablePlexusContainer;
 import org.codehaus.plexus.PlexusContainer;