From 5eec03130695a6b918792ec7b87a2f69a20ed778 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Fri, 1 Feb 2019 12:38:49 -0800
Subject: [PATCH] mavenizing org.aspectj.lib - wip

---
 org.aspectj.lib/.cvsignore                    |  3 ---
 org.aspectj.lib/.project                      | 18 -------------
 org.aspectj.lib/pom.xml                       | 25 +++++++++++++++++++
 .../org/aspectj/lib/pointcuts/Pointcuts.java  |  0
 .../aspectj/lib/tracing/TraceJoinPoints.java  |  0
 .../lib/tracing/TraceJoinPointsBase.java      |  0
 .../java}/org/aspectj/lib/LibModuleTests.java |  0
 .../aspectj/lib/pointcuts/PointcutsTest.java  |  0
 .../aspectj/lib/pointcuts/PointcutsTests.java |  0
 .../lib/tracing/TraceJoinPointsTest.java      |  0
 .../org/aspectj/lib/tracing/TracingTests.java |  0
 11 files changed, 25 insertions(+), 21 deletions(-)
 delete mode 100644 org.aspectj.lib/.cvsignore
 delete mode 100644 org.aspectj.lib/.project
 create mode 100644 org.aspectj.lib/pom.xml
 rename org.aspectj.lib/src/{ => main/java}/org/aspectj/lib/pointcuts/Pointcuts.java (100%)
 rename org.aspectj.lib/src/{ => main/java}/org/aspectj/lib/tracing/TraceJoinPoints.java (100%)
 rename org.aspectj.lib/src/{ => main/java}/org/aspectj/lib/tracing/TraceJoinPointsBase.java (100%)
 rename org.aspectj.lib/{testsrc => src/test/java}/org/aspectj/lib/LibModuleTests.java (100%)
 rename org.aspectj.lib/{testsrc => src/test/java}/org/aspectj/lib/pointcuts/PointcutsTest.java (100%)
 rename org.aspectj.lib/{testsrc => src/test/java}/org/aspectj/lib/pointcuts/PointcutsTests.java (100%)
 rename org.aspectj.lib/{testsrc => src/test/java}/org/aspectj/lib/tracing/TraceJoinPointsTest.java (100%)
 rename org.aspectj.lib/{testsrc => src/test/java}/org/aspectj/lib/tracing/TracingTests.java (100%)

diff --git a/org.aspectj.lib/.cvsignore b/org.aspectj.lib/.cvsignore
deleted file mode 100644
index 432f06cec..000000000
--- a/org.aspectj.lib/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.generated.lst
-.generated.ajsym
-bin
diff --git a/org.aspectj.lib/.project b/org.aspectj.lib/.project
deleted file mode 100644
index 06769d2e4..000000000
--- a/org.aspectj.lib/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.aspectj.lib</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.ajdt.core.ajbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.ajdt.ui.ajnature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.aspectj.lib/pom.xml b/org.aspectj.lib/pom.xml
new file mode 100644
index 000000000..d90092aab
--- /dev/null
+++ b/org.aspectj.lib/pom.xml
@@ -0,0 +1,25 @@
+<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>runtime</artifactId>
+  <packaging>jar</packaging>
+  <name>runtime</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>testing-util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/org.aspectj.lib/src/org/aspectj/lib/pointcuts/Pointcuts.java b/org.aspectj.lib/src/main/java/org/aspectj/lib/pointcuts/Pointcuts.java
similarity index 100%
rename from org.aspectj.lib/src/org/aspectj/lib/pointcuts/Pointcuts.java
rename to org.aspectj.lib/src/main/java/org/aspectj/lib/pointcuts/Pointcuts.java
diff --git a/org.aspectj.lib/src/org/aspectj/lib/tracing/TraceJoinPoints.java b/org.aspectj.lib/src/main/java/org/aspectj/lib/tracing/TraceJoinPoints.java
similarity index 100%
rename from org.aspectj.lib/src/org/aspectj/lib/tracing/TraceJoinPoints.java
rename to org.aspectj.lib/src/main/java/org/aspectj/lib/tracing/TraceJoinPoints.java
diff --git a/org.aspectj.lib/src/org/aspectj/lib/tracing/TraceJoinPointsBase.java b/org.aspectj.lib/src/main/java/org/aspectj/lib/tracing/TraceJoinPointsBase.java
similarity index 100%
rename from org.aspectj.lib/src/org/aspectj/lib/tracing/TraceJoinPointsBase.java
rename to org.aspectj.lib/src/main/java/org/aspectj/lib/tracing/TraceJoinPointsBase.java
diff --git a/org.aspectj.lib/testsrc/org/aspectj/lib/LibModuleTests.java b/org.aspectj.lib/src/test/java/org/aspectj/lib/LibModuleTests.java
similarity index 100%
rename from org.aspectj.lib/testsrc/org/aspectj/lib/LibModuleTests.java
rename to org.aspectj.lib/src/test/java/org/aspectj/lib/LibModuleTests.java
diff --git a/org.aspectj.lib/testsrc/org/aspectj/lib/pointcuts/PointcutsTest.java b/org.aspectj.lib/src/test/java/org/aspectj/lib/pointcuts/PointcutsTest.java
similarity index 100%
rename from org.aspectj.lib/testsrc/org/aspectj/lib/pointcuts/PointcutsTest.java
rename to org.aspectj.lib/src/test/java/org/aspectj/lib/pointcuts/PointcutsTest.java
diff --git a/org.aspectj.lib/testsrc/org/aspectj/lib/pointcuts/PointcutsTests.java b/org.aspectj.lib/src/test/java/org/aspectj/lib/pointcuts/PointcutsTests.java
similarity index 100%
rename from org.aspectj.lib/testsrc/org/aspectj/lib/pointcuts/PointcutsTests.java
rename to org.aspectj.lib/src/test/java/org/aspectj/lib/pointcuts/PointcutsTests.java
diff --git a/org.aspectj.lib/testsrc/org/aspectj/lib/tracing/TraceJoinPointsTest.java b/org.aspectj.lib/src/test/java/org/aspectj/lib/tracing/TraceJoinPointsTest.java
similarity index 100%
rename from org.aspectj.lib/testsrc/org/aspectj/lib/tracing/TraceJoinPointsTest.java
rename to org.aspectj.lib/src/test/java/org/aspectj/lib/tracing/TraceJoinPointsTest.java
diff --git a/org.aspectj.lib/testsrc/org/aspectj/lib/tracing/TracingTests.java b/org.aspectj.lib/src/test/java/org/aspectj/lib/tracing/TracingTests.java
similarity index 100%
rename from org.aspectj.lib/testsrc/org/aspectj/lib/tracing/TracingTests.java
rename to org.aspectj.lib/src/test/java/org/aspectj/lib/tracing/TracingTests.java
-- 
2.39.5