Author: struberg Date: Fri Aug 31 22:53:50 2012 New Revision: 1379657 URL: http://svn.apache.org/viewvc?rev=1379657&view=rev Log: MSHARED-239 remove a few more p-u classes and dependencies
Modified: maven/shared/trunk/maven-common-artifact-filters/pom.xml maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java maven/shared/trunk/maven-filtering/pom.xml maven/shared/trunk/maven-invoker/pom.xml maven/shared/trunk/maven-reporting-impl/pom.xml maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/scan/AbstractResourceInclusionScanner.java Modified: maven/shared/trunk/maven-common-artifact-filters/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/pom.xml?rev=1379657&r1=1379656&r2=1379657&view=diff ============================================================================== --- maven/shared/trunk/maven-common-artifact-filters/pom.xml (original) +++ maven/shared/trunk/maven-common-artifact-filters/pom.xml Fri Aug 31 22:53:50 2012 @@ -64,11 +64,6 @@ <version>1.5.5</version> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>2.1</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.9</version> Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java?rev=1379657&r1=1379656&r2=1379657&view=diff ============================================================================== --- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java (original) +++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java Fri Aug 31 22:53:50 2012 @@ -19,6 +19,8 @@ package org.apache.maven.shared.dependen * under the License. */ +import org.apache.maven.shared.utils.io.DirectoryScanner; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -29,7 +31,6 @@ import java.net.URL; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; -import org.codehaus.plexus.util.DirectoryScanner; /** * Utility to visit classes in a library given either as a jar file or an exploded directory. Modified: maven/shared/trunk/maven-filtering/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1379657&r1=1379656&r2=1379657&view=diff ============================================================================== --- maven/shared/trunk/maven-filtering/pom.xml (original) +++ maven/shared/trunk/maven-filtering/pom.xml Fri Aug 31 22:53:50 2012 @@ -106,6 +106,7 @@ <artifactId>maven-shared-utils</artifactId> <version>0.1-SNAPSHOT</version> </dependency> + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> Modified: maven/shared/trunk/maven-invoker/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=1379657&r1=1379656&r2=1379657&view=diff ============================================================================== --- maven/shared/trunk/maven-invoker/pom.xml (original) +++ maven/shared/trunk/maven-invoker/pom.xml Fri Aug 31 22:53:50 2012 @@ -52,11 +52,6 @@ under the License. <version>0.1-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>2.0.5</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.2</version> Modified: maven/shared/trunk/maven-reporting-impl/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/pom.xml?rev=1379657&r1=1379656&r2=1379657&view=diff ============================================================================== --- maven/shared/trunk/maven-reporting-impl/pom.xml (original) +++ maven/shared/trunk/maven-reporting-impl/pom.xml Fri Aug 31 22:53:50 2012 @@ -108,11 +108,6 @@ <artifactId>commons-validator</artifactId> <version>1.3.1</version> </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>1.5.8</version> - </dependency> <!-- test --> <dependency> Modified: maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/scan/AbstractResourceInclusionScanner.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/scan/AbstractResourceInclusionScanner.java?rev=1379657&r1=1379656&r2=1379657&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/scan/AbstractResourceInclusionScanner.java (original) +++ maven/shared/trunk/maven-shared-io/src/main/java/org/apache/maven/shared/io/scan/AbstractResourceInclusionScanner.java Fri Aug 31 22:53:50 2012 @@ -20,7 +20,7 @@ package org.apache.maven.shared.io.scan; */ import org.apache.maven.shared.io.scan.mapping.SourceMapping; -import org.codehaus.plexus.util.DirectoryScanner; +import org.apache.maven.shared.utils.io.DirectoryScanner; import java.io.File; import java.util.ArrayList;