From aac7e58448f0e5a961075baca670dac1ae53ce98 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Fri, 1 Feb 2019 12:42:09 -0800
Subject: [PATCH] mavenizing build - wip

---
 build/.classpath                              |  9 -----
 build/.cvsignore                              |  2 --
 build/.isJava5                                |  1 -
 build/.project                                | 17 ----------
 build/local.properties                        | 12 -------
 build/pom.xml                                 | 33 +++++++++++++++++++
 .../tools/ant/taskdefs/AJInstaller.java       |  0
 .../internal/tools/ant/taskdefs/AJPush.java   |  0
 .../tools/ant/taskdefs/AntBuilder.java        |  0
 .../tools/ant/taskdefs/BuildModule.java       |  0
 .../tools/ant/taskdefs/Checklics.java         |  0
 .../tools/ant/taskdefs/ConditionalTask.java   |  0
 .../ant/taskdefs/CopyAndInlineStylesheet.java |  0
 .../tools/ant/taskdefs/StripNonBodyHtml.java  |  0
 .../tools/ant/taskdefs/TestBuildModule.java   |  0
 .../tools/ant/taskdefs/VersionUptodate.java   |  0
 .../tools/ant/taskdefs/taskdefs.properties    |  0
 .../internal/tools/build/BuildSpec.java       |  0
 .../aspectj/internal/tools/build/Builder.java |  0
 .../internal/tools/build/Builder.properties   |  0
 .../internal/tools/build/Messager.java        |  0
 .../aspectj/internal/tools/build/Module.java  |  0
 .../aspectj/internal/tools/build/Modules.java |  0
 .../internal/tools/build/ProductModule.java   |  0
 .../aspectj/internal/tools/build/Result.java  |  0
 .../internal/tools/build/SampleGatherer.java  |  0
 .../aspectj/internal/tools/build/Util.java    |  0
 .../aspectj/internal/tools/build/package.html |  0
 .../java}/$installer$/org/aspectj/Main.java   |  0
 .../org/aspectj/build/BuildModuleTests.java   |  0
 .../internal/build/BuildClasspathTest.java    |  0
 .../internal/build/BuildModuleTest.java       |  0
 .../aspectj/internal/build/ModulesTest.java   |  0
 .../internal/tools/build/UtilsTest.01.MF      |  0
 .../internal/tools/build/UtilsTest.02.MF      |  0
 .../internal/tools/build/UtilsTest.03.MF      |  0
 .../internal/tools/build/UtilsTest.java       |  0
 37 files changed, 33 insertions(+), 41 deletions(-)
 delete mode 100644 build/.classpath
 delete mode 100644 build/.cvsignore
 delete mode 100644 build/.isJava5
 delete mode 100644 build/.project
 delete mode 100644 build/local.properties
 create mode 100644 build/pom.xml
 rename build/src/{org => main/java.}/aspectj/internal/tools/ant/taskdefs/AJInstaller.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/ant/taskdefs/AJPush.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/ant/taskdefs/AntBuilder.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/ant/taskdefs/BuildModule.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/ant/taskdefs/Checklics.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/ant/taskdefs/ConditionalTask.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/ant/taskdefs/VersionUptodate.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/ant/taskdefs/taskdefs.properties (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/build/BuildSpec.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/build/Builder.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/build/Builder.properties (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/build/Messager.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/build/Module.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/build/Modules.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/build/ProductModule.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/build/Result.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/build/SampleGatherer.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/build/Util.java (100%)
 rename build/src/{org => main/java.}/aspectj/internal/tools/build/package.html (100%)
 rename build/src/{ => main/java}/$installer$/org/aspectj/Main.java (100%)
 rename build/{testsrc => src/test/java}/org/aspectj/build/BuildModuleTests.java (100%)
 rename build/{testsrc => src/test/java}/org/aspectj/internal/build/BuildClasspathTest.java (100%)
 rename build/{testsrc => src/test/java}/org/aspectj/internal/build/BuildModuleTest.java (100%)
 rename build/{testsrc => src/test/java}/org/aspectj/internal/build/ModulesTest.java (100%)
 rename build/{testsrc => src/test/java}/org/aspectj/internal/tools/build/UtilsTest.01.MF (100%)
 rename build/{testsrc => src/test/java}/org/aspectj/internal/tools/build/UtilsTest.02.MF (100%)
 rename build/{testsrc => src/test/java}/org/aspectj/internal/tools/build/UtilsTest.03.MF (100%)
 rename build/{testsrc => src/test/java}/org/aspectj/internal/tools/build/UtilsTest.java (100%)

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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/ant/taskdefs/AJPush.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/ant/taskdefs/BuildModule.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/ant/taskdefs/ConditionalTask.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/ant/taskdefs/CopyAndInlineStylesheet.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/ant/taskdefs/VersionUptodate.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/ant/taskdefs/taskdefs.properties
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/build/BuildSpec.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/build/Builder.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/build/Builder.properties
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/build/Messager.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/build/Module.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/build/Modules.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/build/ProductModule.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/build/Result.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/build/SampleGatherer.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/build/Util.java
rename to 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
similarity index 100%
rename from build/src/org/aspectj/internal/tools/build/package.html
rename to 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
similarity index 100%
rename from build/src/$installer$/org/aspectj/Main.java
rename to 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
similarity index 100%
rename from build/testsrc/org/aspectj/build/BuildModuleTests.java
rename to 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
similarity index 100%
rename from build/testsrc/org/aspectj/internal/build/BuildClasspathTest.java
rename to 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
similarity index 100%
rename from build/testsrc/org/aspectj/internal/build/BuildModuleTest.java
rename to 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
similarity index 100%
rename from build/testsrc/org/aspectj/internal/build/ModulesTest.java
rename to 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
similarity index 100%
rename from build/testsrc/org/aspectj/internal/tools/build/UtilsTest.01.MF
rename to 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
similarity index 100%
rename from build/testsrc/org/aspectj/internal/tools/build/UtilsTest.02.MF
rename to 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
similarity index 100%
rename from build/testsrc/org/aspectj/internal/tools/build/UtilsTest.03.MF
rename to 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
similarity index 100%
rename from build/testsrc/org/aspectj/internal/tools/build/UtilsTest.java
rename to build/src/test/java/org/aspectj/internal/tools/build/UtilsTest.java
-- 
2.39.5