[MRM-709] use SelectorUtils from ant.

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

diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index b50657070f425edd47a4ef027ea2fca046cf98a7..bbd0381ba6cbb096222b00a678b423b8f9de2334 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -76,6 +76,10 @@
           </exclusion>
         </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.redback.components</groupId>
       <artifactId>spring-utils</artifactId>
@@ -191,6 +195,7 @@
               org.codehaus.plexus.evaluator*,
               org.codehaus.plexus.registry,
               org.codehaus.plexus.util,
+              org.apache.tools.ant.types.selectors,
               org.codehaus.redback.components.registry.commons,
               org.codehaus.redback.components.springutils,
               org.springframework.stereotype;version="[3,4)",

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
index dc4d49e784f4c43f4342ee19a3390bdf78bc9aae..01bb4c32dd1b78ddfb3ba93645686788d08c101e 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
@@ -25,10 +25,10 @@ import org.apache.archiva.configuration.io.registry.ConfigurationRegistryReader;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.configuration.CombinedConfiguration;
+import org.apache.tools.ant.types.selectors.SelectorUtils;
 import org.codehaus.plexus.registry.Registry;
 import org.codehaus.plexus.registry.RegistryException;
 import org.codehaus.plexus.registry.RegistryListener;
-import org.codehaus.plexus.util.SelectorUtils;
 import org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry;
 import org.springframework.stereotype.Service;
 

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 12fe1229d61464ec0df5589c1cdcd47cbccf8a8d..4ba3b2f1d5840ecd29248e3fec27fed42186dc97 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -194,6 +194,10 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.indexer</groupId>
       <artifactId>indexer-core</artifactId>

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 7c5a04a6da2a5466b9581648792af16c49a4518a..2be972c1febbd7af3062b31c06905258aeafff59 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -70,6 +70,10 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.indexer</groupId>
       <artifactId>indexer-core</artifactId>

diff --git a/pom.xml b/pom.xml
index 3c9f1ddd8df3e3f9dbe7246047462459da35bdd3..942ed12e6166ee686ae4bf8c04cac57c27ce676a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -827,6 +827,11 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant</artifactId>
+        <version>1.8.3</version>
+      </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>