From f00f547d7b37647880e7f8fc030f9f96dbad9848 Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Mon, 12 Apr 2021 13:16:29 +0700
Subject: Clean up Maven dependencies using 'dependency:analyze' goal

Notably, this change involves a partial revert of @4a5660b3, because we
are not using JUnit Jupiter yet but still JUnit 4 tests. See discussion
under commit at https://github.com/eclipse/org.aspectj/commit/4a5660b3.

Many other warnings - concerning both used undeclared and unused
declared dependencies - were eliminated by adding or removing the
corresponding dependencies from the POMs. Furthermore, I tried to make
sure that some clearly test-scoped dependencies are now actually
declared as such, so as to avoid unwanted transitivity bleeding into
compile scope and maybe unwanted classes ending up in uber JARs via
Maven Shade or Maven Assembly.

TODO: I am not so sure why modules other than 'run-all-unit-tests' would
depend on test JARs. I hope I broke nothing essential there. As of
today, the other modules where I found '<type>test-jar</type>'
dependencies are:
  - ajde
  - testing
  - testing-drivers
  - tests
  - weaver

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---
 testing/pom.xml | 39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

(limited to 'testing')

diff --git a/testing/pom.xml b/testing/pom.xml
index 0f1089e1f..89877c9e9 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -24,16 +24,6 @@
       <artifactId>bridge</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>runtime</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>asm</artifactId>
@@ -54,6 +44,10 @@
       <artifactId>bcel-builder</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>asm-renamed</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>testing-client</artifactId>
@@ -90,12 +84,6 @@
       <artifactId>ant</artifactId>
       <version>${lib.ant.version}</version>
     </dependency>
-    <dependency>
-      <!-- Identical to lib/regexp/jakarta-regexp-1.2.jar, a former system-scoped dependency -->
-      <groupId>regexp</groupId>
-      <artifactId>regexp</artifactId>
-      <version>${lib.regexp.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>ajde.core</artifactId>
@@ -114,17 +102,6 @@
       <artifactId>xmlParserAPIs</artifactId>
       <version>${lib.ant.xerces.version}</version>
     </dependency>
-    <dependency>
-      <!-- Identical to lib/ant/lib/xercesImpl.jar, a former system-scoped dependency -->
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>${lib.ant.xerces.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13</version>
-    </dependency>
     <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
@@ -132,7 +109,13 @@
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
-      <artifactId>org.eclipse.jdt.core</artifactId>
+      <artifactId>ajdoc</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>${lib.commons.logging.version}</version>
     </dependency>
   </dependencies>
 
-- 
cgit v1.2.3