Author: krosenvold
Date: Mon Oct 13 16:40:30 2014
New Revision: 1631465
URL: http://svn.apache.org/r1631465
Log:
[MCLEAN-55] Updated to maven-shared-utils, which includes NIO delete
Modified:
maven/plugins/trunk/maven-clean-plugin/pom.xml
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Cleaner.java
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java
Modified: maven/plugins/trunk/maven-clean-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/pom.xml?rev=1631465&r1=1631464&r2=1631465&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/pom.xml Mon Oct 13 16:40:30 2014
@@ -71,9 +71,9 @@ under the License.
<version>${mavenVersion}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0.15</version>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>0.7-SNAPSHOT</version>
</dependency>
<!-- dependencies to annotations -->
Modified:
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Cleaner.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Cleaner.java?rev=1631465&r1=1631464&r2=1631465&view=diff
==============================================================================
---
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Cleaner.java
(original)
+++
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Cleaner.java
Mon Oct 13 16:40:30 2014
@@ -23,7 +23,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.maven.plugin.logging.Log;
-import org.codehaus.plexus.util.Os;
+import org.apache.maven.shared.utils.Os;
/**
* Cleans directories.
Modified:
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java?rev=1631465&r1=1631464&r2=1631465&view=diff
==============================================================================
---
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java
(original)
+++
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/GlobSelector.java
Mon Oct 13 16:40:30 2014
@@ -19,11 +19,12 @@ package org.apache.maven.plugin.clean;
* under the License.
*/
+import org.apache.maven.shared.utils.io.DirectoryScanner;
+import org.apache.maven.shared.utils.io.SelectorUtils;
+
import java.io.File;
import java.util.Arrays;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.SelectorUtils;
/**
* Selects paths based on Ant-like glob patterns.