37 files changed, 33 insertions, 41 deletions
diff --git a/build/.classpath b/build/.classpath
deleted file mode 100644
index 2eb26a332..000000000
--- a/build/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="testsrc"/>
-	<classpathentry kind="lib" path="/lib/ant/lib/ant.jar"/>
-	<classpathentry kind="lib" path="/lib/junit/junit.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/build/.cvsignore b/build/.cvsignore
deleted file mode 100644
index 6654feb84..000000000
--- a/build/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-local.properties
diff --git a/build/.isJava5 b/build/.isJava5
deleted file mode 100644
index 136d06384..000000000
--- a/build/.isJava5
+++ /dev/null
@@ -1 +0,0 @@
-  
-\ No newline at end of file
diff --git a/build/.project b/build/.project
deleted file mode 100644
index 1f143eab5..000000000
--- a/build/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>build</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/build/local.properties b/build/local.properties
deleted file mode 100644
index b93e1c816..000000000
--- a/build/local.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# for non-release builds, versions should all be DEVELOPMENT
-# except for build.version.base
-build.version=1.8.2
-build.version.base=1.8
-build.version.long=1.8.2
-build.version.short=1.8.2
-# Repo version is for maven (as built with 'ant repo')
-repo.version=1.6.4
-java11.home=c:/home/apps/jdk11
-java13.home=c:/home/apps/jdk13
-java14.home=c:/home/apps/jdk14
-java15.home=c:/home/apps/jdk15
diff --git a/build/pom.xml b/build/pom.xml
new file mode 100644
index 000000000..5dcf70b71
--- /dev/null
+++ b/build/pom.xml
@@ -0,0 +1,33 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.aspectj</groupId>
+    <artifactId>aspectj-parent</artifactId>
+    <version>1.9.3.BUILD-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+
+  <artifactId>build</artifactId>
+  <packaging>jar</packaging>
+  <name>build</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>testing-util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/ant/lib/ant.jar</systemPath>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/AJInstaller.java
index 6bc2fc09b..6bc2fc09b 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java
+++ b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/AJInstaller.java
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/AJPush.java b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/AJPush.java
index 26ab7ce5f..26ab7ce5f 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/AJPush.java
+++ b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/AJPush.java
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/AntBuilder.java
index d65c50501..d65c50501 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java
+++ b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/AntBuilder.java
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/BuildModule.java
index 6ac6b5ba6..6ac6b5ba6 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java
+++ b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/BuildModule.java
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/Checklics.java
index 904ba4656..904ba4656 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java
+++ b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/Checklics.java
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/ConditionalTask.java b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/ConditionalTask.java
index fdff0d7c1..fdff0d7c1 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/ConditionalTask.java
+++ b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/ConditionalTask.java
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java
index 664616c07..664616c07 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java
+++ b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java
index a33505d95..a33505d95 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java
+++ b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/TestBuildModule.java
index bd3b99609..bd3b99609 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java
+++ b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/TestBuildModule.java
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/VersionUptodate.java b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/VersionUptodate.java
index 92b271c69..92b271c69 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/VersionUptodate.java
+++ b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/VersionUptodate.java
diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/taskdefs.properties b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/taskdefs.properties
index 884077a85..884077a85 100644
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/taskdefs.properties
+++ b/build/src/main/java./aspectj/internal/tools/ant/taskdefs/taskdefs.properties
diff --git a/build/src/org/aspectj/internal/tools/build/BuildSpec.java b/build/src/main/java./aspectj/internal/tools/build/BuildSpec.java
index ed0a453e1..ed0a453e1 100644
--- a/build/src/org/aspectj/internal/tools/build/BuildSpec.java
+++ b/build/src/main/java./aspectj/internal/tools/build/BuildSpec.java
diff --git a/build/src/org/aspectj/internal/tools/build/Builder.java b/build/src/main/java./aspectj/internal/tools/build/Builder.java
index 72f53e901..72f53e901 100644
--- a/build/src/org/aspectj/internal/tools/build/Builder.java
+++ b/build/src/main/java./aspectj/internal/tools/build/Builder.java
diff --git a/build/src/org/aspectj/internal/tools/build/Builder.properties b/build/src/main/java./aspectj/internal/tools/build/Builder.properties
index 3838514f4..3838514f4 100644
--- a/build/src/org/aspectj/internal/tools/build/Builder.properties
+++ b/build/src/main/java./aspectj/internal/tools/build/Builder.properties
diff --git a/build/src/org/aspectj/internal/tools/build/Messager.java b/build/src/main/java./aspectj/internal/tools/build/Messager.java
index 4752fd645..4752fd645 100644
--- a/build/src/org/aspectj/internal/tools/build/Messager.java
+++ b/build/src/main/java./aspectj/internal/tools/build/Messager.java
diff --git a/build/src/org/aspectj/internal/tools/build/Module.java b/build/src/main/java./aspectj/internal/tools/build/Module.java
index 3f0afbfd9..3f0afbfd9 100644
--- a/build/src/org/aspectj/internal/tools/build/Module.java
+++ b/build/src/main/java./aspectj/internal/tools/build/Module.java
diff --git a/build/src/org/aspectj/internal/tools/build/Modules.java b/build/src/main/java./aspectj/internal/tools/build/Modules.java
index 83686820e..83686820e 100644
--- a/build/src/org/aspectj/internal/tools/build/Modules.java
+++ b/build/src/main/java./aspectj/internal/tools/build/Modules.java
diff --git a/build/src/org/aspectj/internal/tools/build/ProductModule.java b/build/src/main/java./aspectj/internal/tools/build/ProductModule.java
index c695a4f8e..c695a4f8e 100644
--- a/build/src/org/aspectj/internal/tools/build/ProductModule.java
+++ b/build/src/main/java./aspectj/internal/tools/build/ProductModule.java
diff --git a/build/src/org/aspectj/internal/tools/build/Result.java b/build/src/main/java./aspectj/internal/tools/build/Result.java
index e12ba4e29..e12ba4e29 100644
--- a/build/src/org/aspectj/internal/tools/build/Result.java
+++ b/build/src/main/java./aspectj/internal/tools/build/Result.java
diff --git a/build/src/org/aspectj/internal/tools/build/SampleGatherer.java b/build/src/main/java./aspectj/internal/tools/build/SampleGatherer.java
index 0b023e6c5..0b023e6c5 100644
--- a/build/src/org/aspectj/internal/tools/build/SampleGatherer.java
+++ b/build/src/main/java./aspectj/internal/tools/build/SampleGatherer.java
diff --git a/build/src/org/aspectj/internal/tools/build/Util.java b/build/src/main/java./aspectj/internal/tools/build/Util.java
index 2fc2dcb72..2fc2dcb72 100644
--- a/build/src/org/aspectj/internal/tools/build/Util.java
+++ b/build/src/main/java./aspectj/internal/tools/build/Util.java
diff --git a/build/src/org/aspectj/internal/tools/build/package.html b/build/src/main/java./aspectj/internal/tools/build/package.html
index 3fa443812..3fa443812 100644
--- a/build/src/org/aspectj/internal/tools/build/package.html
+++ b/build/src/main/java./aspectj/internal/tools/build/package.html
diff --git a/build/src/$installer$/org/aspectj/Main.java b/build/src/main/java/$installer$/org/aspectj/Main.java
index 748b035ae..748b035ae 100644
--- a/build/src/$installer$/org/aspectj/Main.java
+++ b/build/src/main/java/$installer$/org/aspectj/Main.java
diff --git a/build/testsrc/org/aspectj/build/BuildModuleTests.java b/build/src/test/java/org/aspectj/build/BuildModuleTests.java
index 52510c75f..52510c75f 100644
--- a/build/testsrc/org/aspectj/build/BuildModuleTests.java
+++ b/build/src/test/java/org/aspectj/build/BuildModuleTests.java
diff --git a/build/testsrc/org/aspectj/internal/build/BuildClasspathTest.java b/build/src/test/java/org/aspectj/internal/build/BuildClasspathTest.java
index b8cb4b896..b8cb4b896 100644
--- a/build/testsrc/org/aspectj/internal/build/BuildClasspathTest.java
+++ b/build/src/test/java/org/aspectj/internal/build/BuildClasspathTest.java
diff --git a/build/testsrc/org/aspectj/internal/build/BuildModuleTest.java b/build/src/test/java/org/aspectj/internal/build/BuildModuleTest.java
index bc96bef6a..bc96bef6a 100644
--- a/build/testsrc/org/aspectj/internal/build/BuildModuleTest.java
+++ b/build/src/test/java/org/aspectj/internal/build/BuildModuleTest.java
diff --git a/build/testsrc/org/aspectj/internal/build/ModulesTest.java b/build/src/test/java/org/aspectj/internal/build/ModulesTest.java
index 16786404c..16786404c 100644
--- a/build/testsrc/org/aspectj/internal/build/ModulesTest.java
+++ b/build/src/test/java/org/aspectj/internal/build/ModulesTest.java
diff --git a/build/testsrc/org/aspectj/internal/tools/build/UtilsTest.01.MF b/build/src/test/java/org/aspectj/internal/tools/build/UtilsTest.01.MF
index e3ba88396..e3ba88396 100644
--- a/build/testsrc/org/aspectj/internal/tools/build/UtilsTest.01.MF
+++ b/build/src/test/java/org/aspectj/internal/tools/build/UtilsTest.01.MF
diff --git a/build/testsrc/org/aspectj/internal/tools/build/UtilsTest.02.MF b/build/src/test/java/org/aspectj/internal/tools/build/UtilsTest.02.MF
index 5888ab3c0..5888ab3c0 100644
--- a/build/testsrc/org/aspectj/internal/tools/build/UtilsTest.02.MF
+++ b/build/src/test/java/org/aspectj/internal/tools/build/UtilsTest.02.MF
diff --git a/build/testsrc/org/aspectj/internal/tools/build/UtilsTest.03.MF b/build/src/test/java/org/aspectj/internal/tools/build/UtilsTest.03.MF
index b9717c5f2..b9717c5f2 100644
--- a/build/testsrc/org/aspectj/internal/tools/build/UtilsTest.03.MF
+++ b/build/src/test/java/org/aspectj/internal/tools/build/UtilsTest.03.MF
diff --git a/build/testsrc/org/aspectj/internal/tools/build/UtilsTest.java b/build/src/test/java/org/aspectj/internal/tools/build/UtilsTest.java
index 4926d42e8..4926d42e8 100644
--- a/build/testsrc/org/aspectj/internal/tools/build/UtilsTest.java
+++ b/build/src/test/java/org/aspectj/internal/tools/build/UtilsTest.java