svn commit: r1021399 - in /maven/plugins/trunk/maven-assembly-plugin: pom.xml src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java

[jdcasey]

Author: jdcasey
Date: Mon Oct 11 16:04:05 2010
New Revision: 1021399

URL: http://svn.apache.org/viewvc?rev=1021399&view=rev
Log:
Fixing use of backport-util in unit test, and fixing prerequisite to agree with 
dependencies.

Modified:
    maven/plugins/trunk/maven-assembly-plugin/pom.xml
    
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1021399&r1=1021398&r2=1021399&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Mon Oct 11 16:04:05 2010
@@ -36,7 +36,7 @@ under the License.
   <description>A Maven 2 plugin to create archives of your project's sources, 
classes, dependencies etc. from flexible assembly descriptors.</description>
 
   <prerequisites>
-    <maven>2.0.11</maven>
+    <maven>2.2.1</maven>
   </prerequisites>
 
   <scm>

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java?rev=1021399&r1=1021398&r2=1021399&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
 Mon Oct 11 16:04:05 2010
@@ -22,8 +22,7 @@ import org.codehaus.plexus.logging.Logge
 import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.easymock.MockControl;
 
-import edu.emory.mathcs.backport.java.util.Collections;
-
+import java.util.Collections;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;