[MRM-709] use SelectorUtils from ant.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1309059 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
index 1932fdfcd83047edfc509adcfed3af3de165a43e..ae4e1c010dfd2a95be09ce71ec4a26a13866bf58 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
@@ -41,6 +41,10 @@
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -59,7 +63,8 @@
               org.apache.archiva.common*;version=${project.version},
               org.apache.commons.collections;version="[3.2,4)",
               org.apache.commons.io;version="[1.4,2)",
-              org.codehaus.plexus.util
+              org.codehaus.plexus.util,
+              org.apache.tools.ant.types.selectors
             </Import-Package>
           </instructions>
         </configuration>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java
index 7fe9e533f5eac5573633a4eaf68d8a4e5cc53b55..2dcbd4a10dabe408c027db13f44dcd20bc8d1ece 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/functors/ConsumerWantsFilePredicate.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Predicate;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.archiva.common.utils.BaseFile;
 import org.apache.archiva.consumers.RepositoryContentConsumer;
-import org.codehaus.plexus.util.SelectorUtils;
+import org.apache.tools.ant.types.selectors.SelectorUtils;
 
 /**
  * ConsumerWantsFilePredicate