[MRM-709] use SelectorUtils from ant.

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

diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml
index 2a27f44722b35fc6a74f41752ee48ca98915789c..e974cf6d4adf883b608fb26fadb5164b430bafc8 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -61,6 +61,10 @@
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.sonatype.sisu</groupId>
       <artifactId>sisu-inject-plexus</artifactId>
@@ -185,7 +189,7 @@
               org.springframework.stereotype;version="[3,4)",
               org.codehaus.plexus.registry,
               org.codehaus.plexus.taskqueue,
-              org.codehaus.plexus.util,
+              org.apache.tools.ant.types.selectors,
               org.apache.maven.wagon,
               org.apache.maven.wagon.authentication,
               org.apache.maven.wagon.proxy,

diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
index d9d61542617a644a033e77a4437b34f4e6051dfa..40173802fbacfe0e04f5017cb74575eb95800f77 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
@@ -63,10 +63,10 @@ import org.apache.maven.wagon.authentication.AuthenticationException;
 import org.apache.maven.wagon.authentication.AuthenticationInfo;
 import org.apache.maven.wagon.proxy.ProxyInfo;
 import org.apache.maven.wagon.repository.Repository;
+import org.apache.tools.ant.types.selectors.SelectorUtils;
 import org.codehaus.plexus.registry.Registry;
 import org.codehaus.plexus.registry.RegistryListener;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
-import org.codehaus.plexus.util.SelectorUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;