From 6572625c98dac283d6711e644b7320a02a38deaa Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Wed, 30 Jan 2019 11:31:11 -0800
Subject: [PATCH] mavenizing taskdefs - wip

---
 taskdefs/.classpath                           | 15 -----
 taskdefs/.cvsignore                           |  2 -
 taskdefs/.isJava5                             |  1 -
 taskdefs/.project                             | 20 -------
 taskdefs/build.xml                            |  6 --
 taskdefs/pom.xml                              | 60 +++++++++++++++++++
 .../org/aspectj/tools/ant/taskdefs/Ajc10.java |  0
 .../ant/taskdefs/Ajc11CompilerAdapter.java    |  0
 .../org/aspectj/tools/ant/taskdefs/Ajc2.java  |  0
 .../ant/taskdefs/AjcCompilerAdapter.java      |  0
 .../aspectj/tools/ant/taskdefs/AjcTask.java   |  0
 .../org/aspectj/tools/ant/taskdefs/Ajdoc.java |  0
 .../tools/ant/taskdefs/ICommandEditor.java    |  0
 .../ant/taskdefs/aspectjTaskdefs.properties   |  0
 .../tools/ant/taskdefs/compilers/Ajc.java     |  0
 .../resources}/org/aspectj/antlib.xml         |  0
 .../tools/ant/TaskdefsModuleTests.java        |  0
 .../taskdefs/Ajc11CompilerAdapterTest.java    |  0
 .../tools/ant/taskdefs/AjcTaskTest.java       |  0
 .../aspectj/tools/ant/taskdefs/AjdocTest.java |  0
 .../tools/ant/taskdefs/TaskdefsTests.java     |  0
 21 files changed, 60 insertions(+), 44 deletions(-)
 delete mode 100644 taskdefs/.classpath
 delete mode 100644 taskdefs/.cvsignore
 delete mode 100644 taskdefs/.isJava5
 delete mode 100644 taskdefs/.project
 delete mode 100644 taskdefs/build.xml
 create mode 100644 taskdefs/pom.xml
 rename taskdefs/src/{ => main/java}/org/aspectj/tools/ant/taskdefs/Ajc10.java (100%)
 rename taskdefs/src/{ => main/java}/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java (100%)
 rename taskdefs/src/{ => main/java}/org/aspectj/tools/ant/taskdefs/Ajc2.java (100%)
 rename taskdefs/src/{ => main/java}/org/aspectj/tools/ant/taskdefs/AjcCompilerAdapter.java (100%)
 rename taskdefs/src/{ => main/java}/org/aspectj/tools/ant/taskdefs/AjcTask.java (100%)
 rename taskdefs/src/{ => main/java}/org/aspectj/tools/ant/taskdefs/Ajdoc.java (100%)
 rename taskdefs/src/{ => main/java}/org/aspectj/tools/ant/taskdefs/ICommandEditor.java (100%)
 rename taskdefs/src/{ => main/java}/org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties (100%)
 rename taskdefs/src/{ => main/java}/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java (100%)
 rename taskdefs/src/{ => main/resources}/org/aspectj/antlib.xml (100%)
 rename taskdefs/{testsrc => src/test/java}/org/aspectj/tools/ant/TaskdefsModuleTests.java (100%)
 rename taskdefs/{testsrc => src/test/java}/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java (100%)
 rename taskdefs/{testsrc => src/test/java}/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java (100%)
 rename taskdefs/{testsrc => src/test/java}/org/aspectj/tools/ant/taskdefs/AjdocTest.java (100%)
 rename taskdefs/{testsrc => src/test/java}/org/aspectj/tools/ant/taskdefs/TaskdefsTests.java (100%)

diff --git a/taskdefs/.classpath b/taskdefs/.classpath
deleted file mode 100644
index 469d09464..000000000
--- a/taskdefs/.classpath
+++ /dev/null
@@ -1,15 +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/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/>
-	<classpathentry kind="lib" path="/lib/ant/lib/ant.jar" sourcepath="/lib/ant/ant-src.zip"/>
-	<classpathentry kind="src" path="/bridge"/>
-	<classpathentry kind="src" path="/org.aspectj.ajdt.core"/>
-	<classpathentry kind="src" path="/util"/>
-	<classpathentry kind="lib" path="/lib/ant/lib/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="/lib/ant/lib/xml-apis.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ajdoc"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/taskdefs/.cvsignore b/taskdefs/.cvsignore
deleted file mode 100644
index 38972d828..000000000
--- a/taskdefs/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-bintest
diff --git a/taskdefs/.isJava5 b/taskdefs/.isJava5
deleted file mode 100644
index 136d06384..000000000
--- a/taskdefs/.isJava5
+++ /dev/null
@@ -1 +0,0 @@
-  
\ No newline at end of file
diff --git a/taskdefs/.project b/taskdefs/.project
deleted file mode 100644
index 19faa6bd4..000000000
--- a/taskdefs/.project
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>taskdefs</name>
-	<comment></comment>
-	<projects>
-		<project>bridge</project>
-		<project>org.aspectj.ajdt.core</project>
-		<project>util</project>
-	</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/taskdefs/build.xml b/taskdefs/build.xml
deleted file mode 100644
index c25c6e792..000000000
--- a/taskdefs/build.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="taskdefs" default="test" basedir=".">
-    <import file="${basedir}/../build/build.xml"/>  
-</project>
-
diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml
new file mode 100644
index 000000000..b81024948
--- /dev/null
+++ b/taskdefs/pom.xml
@@ -0,0 +1,60 @@
+<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>taskdefs</artifactId>
+  <packaging>jar</packaging>
+  <name>taskdefs</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>bridge</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>ajdoc</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>org.aspectj.ajdt.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/ant/lib/xml-apis.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>xercesImpl</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/ant/lib/xercesImpl.jar</systemPath>
+    </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/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc10.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc10.java
similarity index 100%
rename from taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc10.java
rename to taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc10.java
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java
similarity index 100%
rename from taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java
rename to taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc2.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java
similarity index 100%
rename from taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc2.java
rename to taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcCompilerAdapter.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcCompilerAdapter.java
similarity index 100%
rename from taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcCompilerAdapter.java
rename to taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcCompilerAdapter.java
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java
similarity index 100%
rename from taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
rename to taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajdoc.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajdoc.java
similarity index 100%
rename from taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajdoc.java
rename to taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajdoc.java
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/ICommandEditor.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/ICommandEditor.java
similarity index 100%
rename from taskdefs/src/org/aspectj/tools/ant/taskdefs/ICommandEditor.java
rename to taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/ICommandEditor.java
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties
similarity index 100%
rename from taskdefs/src/org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties
rename to taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java
similarity index 100%
rename from taskdefs/src/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java
rename to taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java
diff --git a/taskdefs/src/org/aspectj/antlib.xml b/taskdefs/src/main/resources/org/aspectj/antlib.xml
similarity index 100%
rename from taskdefs/src/org/aspectj/antlib.xml
rename to taskdefs/src/main/resources/org/aspectj/antlib.xml
diff --git a/taskdefs/testsrc/org/aspectj/tools/ant/TaskdefsModuleTests.java b/taskdefs/src/test/java/org/aspectj/tools/ant/TaskdefsModuleTests.java
similarity index 100%
rename from taskdefs/testsrc/org/aspectj/tools/ant/TaskdefsModuleTests.java
rename to taskdefs/src/test/java/org/aspectj/tools/ant/TaskdefsModuleTests.java
diff --git a/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java
similarity index 100%
rename from taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java
rename to taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapterTest.java
diff --git a/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
similarity index 100%
rename from taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
rename to taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
diff --git a/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjdocTest.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjdocTest.java
similarity index 100%
rename from taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjdocTest.java
rename to taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjdocTest.java
diff --git a/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/TaskdefsTests.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/TaskdefsTests.java
similarity index 100%
rename from taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/TaskdefsTests.java
rename to taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/TaskdefsTests.java
-- 
2.39.5