[refactor] Remove code copied from an old version of Apache Ant, just…

… use the Ant dependency we already have

exist-ant/pom.xml

@@ -108,17 +108,6 @@
                 <filtering>true</filtering>
             </testResource>
         </testResources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.owasp</groupId>
-                <artifactId>dependency-check-maven</artifactId>
-                <configuration>
-                    <!-- clashes with Ant 1.10.6, see https://github.com/jeremylong/DependencyCheck/issues/1914 -->
-                    <skipSystemScope>true</skipSystemScope>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 
 </project>

exist-core/pom.xml

@@ -435,6 +435,11 @@
             <artifactId>bifurcan</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

exist-core/src/main/java/org/exist/client/InteractiveClient.java

@@ -43,6 +43,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.OutputKeys;
 
+import org.apache.tools.ant.DirectoryScanner;
 import org.exist.SystemProperties;
 import org.exist.dom.persistent.XMLUtil;
 import org.exist.security.ACLPermission;
@@ -1408,7 +1409,15 @@ protected synchronized boolean parse(final Path file) throws XMLDBException {
                     files.add(file);
                 }
             } else {
-                files = DirectoryScanner.scanDir(file.toString());
+                final DirectoryScanner directoryScanner = new DirectoryScanner();
+                directoryScanner.setIncludes(new String[] { file.toString() });
+                //TODO(AR) do we need to call scanner.setBasedir()?
+                directoryScanner.setCaseSensitive(true);
+                directoryScanner.scan();
+                for (final String includedFile : directoryScanner.getIncludedFiles()) {
+//                    files.add(baseDir.resolve(includedFile));
+                    files.add(Paths.get(includedFile));
+                }
             }
 
             final long start0 = System.currentTimeMillis();
@@ -1540,7 +1549,18 @@ protected synchronized boolean parseGZip(String fileName) throws XMLDBException,
                 files.add(file);
             }
         } else {
-            files = DirectoryScanner.scanDir(fileName);
+            final DirectoryScanner directoryScanner = new DirectoryScanner();
+            directoryScanner.setIncludes(new String[] { fileName });
+            //TODO(AR) do we need to call scanner.setBasedir()?
+            directoryScanner.setCaseSensitive(true);
+            directoryScanner.scan();
+
+            final String[] includedFiles = directoryScanner.getIncludedFiles();
+            files = new ArrayList<>(includedFiles.length);
+            for (final String includedFile : includedFiles) {
+//                files.add(baseDir.resolve(includedFile));
+                files.add(Paths.get(includedFile));
+            }
         }
 
         final long start0 = System.currentTimeMillis();

exist-core/src/main/java/org/exist/util/CollectionScanner.java

@@ -24,6 +24,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.types.selectors.SelectorUtils;
 import org.xmldb.api.base.Collection;
 import org.xmldb.api.base.Resource;
 import org.xmldb.api.base.XMLDBException;
@@ -53,7 +55,7 @@ public final static void scan(List<Resource> list, Collection current, String vp
 		for (String sub : childCollections) {
 			name = vpath + sub;
 			System.out.println("checking " + name + " = " + pattern);
-			if (DirectoryScanner.matchStart(pattern, name))
+			if (SelectorUtils.matchPatternStart(pattern, name))
 			///TODO : use dedicated function in XmldbURI
 			{
 				scan(list, current.getChildCollection(sub), name + "/", pattern);