From 241ce080c1c4a625ebcab1108663b74271a8eae1 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Thu, 31 Jan 2019 12:20:25 -0800
Subject: [PATCH] mavenizing run-all-junit-tests - wip

---
 run-all-junit-tests/.classpath                |  30 -----
 run-all-junit-tests/.cvsignore                |   4 -
 run-all-junit-tests/.project                  |  32 -----
 run-all-junit-tests/build.xml                 |   6 -
 run-all-junit-tests/pom.xml                   | 116 ++++++++++++++++++
 .../test/java}/AllModuleTests.java            |   0
 .../{testsrc => src/test/java}/AllTests.java  |   0
 .../java}/RunTheseBeforeYouCommitTests.java   |   0
 8 files changed, 116 insertions(+), 72 deletions(-)
 delete mode 100644 run-all-junit-tests/.classpath
 delete mode 100644 run-all-junit-tests/.cvsignore
 delete mode 100644 run-all-junit-tests/.project
 delete mode 100644 run-all-junit-tests/build.xml
 create mode 100644 run-all-junit-tests/pom.xml
 rename run-all-junit-tests/{testsrc => src/test/java}/AllModuleTests.java (100%)
 rename run-all-junit-tests/{testsrc => src/test/java}/AllTests.java (100%)
 rename run-all-junit-tests/{testsrc => src/test/java}/RunTheseBeforeYouCommitTests.java (100%)

diff --git a/run-all-junit-tests/.classpath b/run-all-junit-tests/.classpath
deleted file mode 100644
index 48efada18..000000000
--- a/run-all-junit-tests/.classpath
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="testsrc"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/ajbrowser"/>
-	<classpathentry kind="src" path="/ajde"/>
-	<classpathentry kind="src" path="/asm"/>
-	<classpathentry kind="src" path="/bridge"/>
-	<classpathentry kind="src" path="/build"/>
-	<classpathentry kind="src" path="/org.aspectj.ajdt.core"/>
-	<classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-	<classpathentry kind="src" path="/runtime"/>
-	<classpathentry kind="src" path="/taskdefs"/>
-	<classpathentry kind="src" path="/testing"/>
-	<classpathentry kind="src" path="/testing-client"/>
-	<classpathentry kind="src" path="/testing-drivers"/>
-	<classpathentry kind="src" path="/testing-util"/>
-	<classpathentry kind="src" path="/util"/>
-	<classpathentry kind="src" path="/weaver"/>
-	<classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/>
-	<classpathentry kind="src" path="/tests"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/aspectj5rt"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ajdoc"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/loadtime"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/loadtime5"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/weaver5"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ajde.core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.aspectj.matcher"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/run-all-junit-tests/.cvsignore b/run-all-junit-tests/.cvsignore
deleted file mode 100644
index 7b42ed3b6..000000000
--- a/run-all-junit-tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-out
-bin
-default.ajsym
-default.lst
diff --git a/run-all-junit-tests/.project b/run-all-junit-tests/.project
deleted file mode 100644
index d7718dc8b..000000000
--- a/run-all-junit-tests/.project
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>run-all-junit-tests</name>
-	<comment></comment>
-	<projects>
-		<project>ajbrowser</project>
-		<project>ajde</project>
-		<project>asm</project>
-		<project>bridge</project>
-		<project>build</project>
-		<project>org.aspectj.ajdt.core</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>runtime</project>
-		<project>taskdefs</project>
-		<project>testing</project>
-		<project>testing-client</project>
-		<project>testing-drivers</project>
-		<project>testing-util</project>
-		<project>util</project>
-		<project>weaver</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/run-all-junit-tests/build.xml b/run-all-junit-tests/build.xml
deleted file mode 100644
index 5afbd5589..000000000
--- a/run-all-junit-tests/build.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="run-all-junit-tests" default="test" basedir=".">
-    <import file="${basedir}/../build/build.xml"/>  
-</project>
-
diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml
new file mode 100644
index 000000000..1b7d974d3
--- /dev/null
+++ b/run-all-junit-tests/pom.xml
@@ -0,0 +1,116 @@
+<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>run-all-junit-tests</artifactId>
+  <packaging>jar</packaging>
+  <name>run-all-junit-tests</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>asm</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>runtime</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>taskdefs</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>testing</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>testing-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>testing-drivers</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>testing-util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>weaver</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>tests</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>org.aspectj.ajdt.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>org.eclipse.jdt.core</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>loadtime</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>ajde.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>org.aspectj.matcher</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>ajde</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>ajbrowser</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/run-all-junit-tests/testsrc/AllModuleTests.java b/run-all-junit-tests/src/test/java/AllModuleTests.java
similarity index 100%
rename from run-all-junit-tests/testsrc/AllModuleTests.java
rename to run-all-junit-tests/src/test/java/AllModuleTests.java
diff --git a/run-all-junit-tests/testsrc/AllTests.java b/run-all-junit-tests/src/test/java/AllTests.java
similarity index 100%
rename from run-all-junit-tests/testsrc/AllTests.java
rename to run-all-junit-tests/src/test/java/AllTests.java
diff --git a/run-all-junit-tests/testsrc/RunTheseBeforeYouCommitTests.java b/run-all-junit-tests/src/test/java/RunTheseBeforeYouCommitTests.java
similarity index 100%
rename from run-all-junit-tests/testsrc/RunTheseBeforeYouCommitTests.java
rename to run-all-junit-tests/src/test/java/RunTheseBeforeYouCommitTests.java
-- 
2.39.5