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>

diff --git a/ajbrowser/pom.xml b/ajbrowser/pom.xml
index 009bc2f77aedc1085dc477a45c6c7fcac1af784d..78041e7c36cd7ce590ef46a9250424e4cf76f824 100644 (file)
--- a/ajbrowser/pom.xml
+++ b/ajbrowser/pom.xml
@@ -34,37 +34,15 @@
       <artifactId>asm</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>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>weaver</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>org.aspectj.ajdt.core</artifactId>
       <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

diff --git a/ajde.core/pom.xml b/ajde.core/pom.xml
index 8ed061954737be9dff1cfb5f2a78f0abb10893e7..22ec19759866acbbb45bd03440b45ebea0e1828d 100644 (file)
--- a/ajde.core/pom.xml
+++ b/ajde.core/pom.xml
@@ -38,5 +38,15 @@
       <groupId>org.aspectj</groupId>
       <artifactId>org.eclipse.jdt.core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>asm-renamed</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>testing-util</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/ajde/pom.xml b/ajde/pom.xml
index 42c9e10c4a80b5c014ce8bbcb9cd95121dcdece5..2c3ad63beee86cf453822835b12429395df0cc96 100644 (file)
--- a/ajde/pom.xml
+++ b/ajde/pom.xml
@@ -34,6 +34,10 @@
       <artifactId>org.aspectj.ajdt.core</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>asm-renamed</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>org.aspectj.ajdt.core</artifactId>
@@ -50,5 +54,11 @@
       <artifactId>ajde.core</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>testing-util</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml
index f7ae7ab00b312b87b144cc2c5fc4eba56bc05f89..dee6a59ca5800caf98ae7855c8443d370c8b62e7 100644 (file)
--- a/ajdoc/pom.xml
+++ b/ajdoc/pom.xml
@@ -34,41 +34,9 @@
       <artifactId>org.aspectj.ajdt.core</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <!-- enables easy dependency on tools.jar -->
-      <groupId>com.github.olivergondza</groupId>
-      <artifactId>maven-jdk-tools-wrapper</artifactId>
-      <version>0.1</version>
-    </dependency>
-
-    <!-- Dependencies needed for running tests in this module independently of complete reactor build -->
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>org.eclipse.jdt.core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
-      <artifactId>org.aspectj.matcher</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>weaver</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>bcel-builder</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>runtime</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
+      <artifactId>asm-renamed</artifactId>
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>

diff --git a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/CompilerWrapper.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/CompilerWrapper.java
index f27d3b1662b43bc1cc25ede85a8d3a91ba4559da..5af5610a924d21fb79d6284bb5ed39289a9aa831 100644 (file)
--- a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/CompilerWrapper.java
+++ b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/CompilerWrapper.java
@@ -1,25 +1,25 @@
 /* *******************************************************************
  * Copyright (c) 2003 Contributors.
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Mik Kersten     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Mik Kersten     initial implementation
  * ******************************************************************/
 package org.aspectj.tools.ajdoc;
 
 import org.aspectj.asm.AsmManager;
 import org.aspectj.bridge.IMessage;
-
+import org.aspectj.tools.ajc.Main;
 /**
  * Wrapper for ajdoc's use of the AspectJ compiler.
- * 
+ *
  * @author Mik Kersten
  */
-public class CompilerWrapper extends org.aspectj.tools.ajc.Main {
+public class CompilerWrapper extends Main {
 
        private static CompilerWrapper INSTANCE = null;
 

diff --git a/build/pom.xml b/build/pom.xml
index 6fa02a049a5c460a232eac57ac9696ed7788e945..0592f41c1f482e77835ecd9e1ff4317215bba5ec 100644 (file)
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -14,12 +14,6 @@
        <name>build</name>
 
        <dependencies>
-               <dependency>
-                       <groupId>org.aspectj</groupId>
-                       <artifactId>testing-util</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
                <dependency>
                        <!-- Identical to lib/ant/lib/ant.jar, a former system-scoped dependency -->
                        <groupId>ant</groupId>

diff --git a/loadtime/pom.xml b/loadtime/pom.xml
index 7c03455e536d2c93d3d000ffc624fcc15f24bfae..f7aae71607a34d05b447bed607084c06bf7a77c7 100644 (file)
--- a/loadtime/pom.xml
+++ b/loadtime/pom.xml
@@ -14,11 +14,6 @@
        <name>loadtime</name>
 
        <dependencies>
-               <dependency>
-                       <groupId>org.aspectj</groupId>
-                       <artifactId>asm</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>bridge</artifactId>
@@ -44,58 +39,21 @@
                        <artifactId>org.aspectj.matcher</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.aspectj</groupId>
+                       <artifactId>asm-renamed</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>testing-util</artifactId>
                        <version>${project.version}</version>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>bcel-builder</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <!-- Identical to lib/ant/lib/xml-apis.jar, a former system-scoped dependency -->
-                       <groupId>xerces</groupId>
-                       <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>
-                       <!-- Identical to lib/ant/lib/ant.jar, a former system-scoped dependency -->
-                       <groupId>ant</groupId>
-      <artifactId>ant</artifactId>
-                       <version>${lib.ant.version}</version>
-    </dependency>
        </dependencies>
 
-<!--
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>3.0.1</version>
-                               <configuration>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>javadoc</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>javadoc</goal>
-                                               </goals>
-                                               <configuration>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
--->
 </project>

diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml
index 165d81505278753163340f69003d010b83639615..5e966498734c94972135952d51d5a93b8a16bc74 100644 (file)
--- a/org.aspectj.ajdt.core/pom.xml
+++ b/org.aspectj.ajdt.core/pom.xml
@@ -48,11 +48,7 @@
       <groupId>org.aspectj</groupId>
       <artifactId>testing-util</artifactId>
       <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>testing-client</artifactId>
-      <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
@@ -60,13 +56,12 @@
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
-      <artifactId>loadtime</artifactId>
+      <artifactId>org.aspectj.matcher</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
-      <artifactId>org.aspectj.matcher</artifactId>
-      <version>${project.version}</version>
+      <artifactId>asm-renamed</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/org.aspectj.lib/pom.xml b/org.aspectj.lib/pom.xml
index 2589f1e65337e32287830ac8cb1d8dc5e8cc6216..0fa2d2e2c336490a6505d0aa1a7d793ec2411ef3 100644 (file)
--- a/org.aspectj.lib/pom.xml
+++ b/org.aspectj.lib/pom.xml
@@ -18,6 +18,7 @@
       <groupId>org.aspectj</groupId>
       <artifactId>testing-util</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml
index 650dfa3edafe94b35bf94b2e35697f002a076ada..89deb5abf2eb5d9df965d5a669afd6c66a862fe8 100644 (file)
--- a/org.aspectj.matcher/pom.xml
+++ b/org.aspectj.matcher/pom.xml
@@ -28,6 +28,7 @@
       <groupId>org.aspectj</groupId>
       <artifactId>testing-util</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>

diff --git a/pom.xml b/pom.xml
index e94ede8c5bb6d503b28f73780d6592b90614a918..81b26d74450af53652564d1116f53cfee6df39b2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -206,6 +206,11 @@
                                        <artifactId>maven-clean-plugin</artifactId>
                                        <version>3.1.0</version>
                                </plugin>
+                               <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-dependency-plugin</artifactId>
+                                       <version>3.1.2</version>
+                               </plugin>
                        </plugins>
                </pluginManagement>
 
@@ -247,6 +252,22 @@
                                <artifactId>maven-help-plugin</artifactId>
                        </plugin>
 
+                       <!--
+                               This plugin is nice to have in the POM, because then it is easy to double-click a goal such as 'analyze' or
+                               'tree' from a modern IDE in order to inspect dependency management in the project.
+                       -->
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-dependency-plugin</artifactId>
+                               <version>3.1.2</version>
+                               <configuration>
+                                       <ignoredUnusedDeclaredDependencies>
+                                               <!-- Declared in parent POM for convenience, but not used in every module -->
+                                               <ignoredUnusedDeclaredDependency>junit:junit:jar</ignoredUnusedDeclaredDependency>
+                                       </ignoredUnusedDeclaredDependencies>
+                               </configuration>
+                       </plugin>
+
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-enforcer-plugin</artifactId>
@@ -302,6 +323,12 @@
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
+                       <dependency>
+                               <groupId>junit</groupId>
+                               <artifactId>junit</artifactId>
+                               <version>4.13.2</version>
+                               <scope>test</scope>
+                       </dependency>
                        <dependency>
                                <groupId>org.aspectj</groupId>
                                <artifactId>org.eclipse.jdt.core</artifactId>
@@ -327,19 +354,13 @@
        </dependencyManagement>
 
        <dependencies>
+               <!--
+                       Actually, it would be cleaner to only define JUnit only it modules which actually use it. But since this comprises
+                       the majority, we can afford to be a little bit unclean here with regard to dependency management.
+               -->
                <dependency>
-                       <groupId>org.junit.jupiter</groupId>
-                       <artifactId>junit-jupiter-api</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.junit.jupiter</groupId>
-                       <artifactId>junit-jupiter-engine</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.junit.vintage</groupId>
-                       <artifactId>junit-vintage-engine</artifactId>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
                        <scope>test</scope>
                </dependency>
        </dependencies>

diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml
index 1b159f47ef86a9131106c74b0af0a13028c1be9c..7d7c2959f5a6fec440b064603c53e542a88eee97 100644 (file)
--- a/run-all-junit-tests/pom.xml
+++ b/run-all-junit-tests/pom.xml
@@ -16,225 +16,133 @@
        <dependencies>
                <dependency>
                        <groupId>org.aspectj</groupId>
-                       <artifactId>bcel-builder</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.aspectj</groupId>
-                       <artifactId>util</artifactId>
-                       <version>${project.version}</version>
+                       <artifactId>asm-renamed</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>util</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>ajde</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>ajde.core</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>asm</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>bridge</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>loadtime</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>runtime</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>ajdoc</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>weaver</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>taskdefs</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>testing-client</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>testing-drivers</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>testing-util</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>org.aspectj.matcher</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.aspectj</groupId>
-                       <artifactId>build</artifactId>
-                       <version>${project.version}</version>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>build</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
-               </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>
+                       <scope>test</scope>
                </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>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>org.aspectj.ajdt.core</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
-               <dependency>
-                       <groupId>org.aspectj</groupId>
-                       <artifactId>org.eclipse.jdt.core</artifactId>
-               </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>
-
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>testing</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
-               </dependency>
-               <dependency>
-                       <!-- Identical to lib/ant/lib/ant.jar, a former system-scoped dependency -->
-                       <groupId>ant</groupId>
-                       <artifactId>ant</artifactId>
-                       <version>${lib.ant.version}</version>
-               </dependency>
-               <dependency>
-                       <!-- Identical to lib/ant/lib/ant-launcher.jar, a former system-scoped dependency -->
-                       <groupId>ant</groupId>
-                       <artifactId>ant-launcher</artifactId>
-                       <version>${lib.ant.version}</version>
+                       <scope>test</scope>
                </dependency>
        </dependencies>
 

diff --git a/runtime/pom.xml b/runtime/pom.xml
index 554f74a627c7b47341ed30aa813b6b815ab3dd79..4f3230c2f809b7f7ee1e78a422f81777536fd452 100644 (file)
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -13,14 +13,6 @@
        <packaging>jar</packaging>
        <name>runtime</name>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.aspectj</groupId>
-                       <artifactId>testing-util</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-       </dependencies>
-
        <build>
                <plugins>
                        <plugin>

diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml
index 74abf20a65f028bc3da4b5eb4f93d38a2dd38c66..f5f35b2d956c8ba3a60badacf9d5f2183e606ad4 100644 (file)
--- a/taskdefs/pom.xml
+++ b/taskdefs/pom.xml
@@ -35,16 +35,8 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <!-- Identical to lib/ant/lib/xml-apis.jar, a former system-scoped dependency -->
-      <groupId>xerces</groupId>
-      <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>
+      <groupId>org.aspectj</groupId>
+      <artifactId>asm-renamed</artifactId>
     </dependency>
     <dependency>
       <!-- Identical to lib/ant/lib/ant.jar, a former system-scoped dependency -->

diff --git a/testing-drivers/pom.xml b/testing-drivers/pom.xml
index 5ab5f35ec4a4f088e18c27f8d39008304634d95f..0132a4441d5213160f6e4643f864f22a447238e2 100644 (file)
--- a/testing-drivers/pom.xml
+++ b/testing-drivers/pom.xml
@@ -19,27 +19,13 @@
       <artifactId>bridge</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>testing</artifactId>
       <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>testing-util</artifactId>
-      <version>${project.version}</version>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>testing-client</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>util</artifactId>
@@ -52,14 +38,7 @@
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
-      <artifactId>asm</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>testing</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
+      <artifactId>asm-renamed</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/testing-util/pom.xml b/testing-util/pom.xml
index 1b8da66664c499308a5165b2f62f60c857ba191b..34e821665ebf5cff7314a84bfdbda00c2a8f8e11 100644 (file)
--- a/testing-util/pom.xml
+++ b/testing-util/pom.xml
@@ -34,7 +34,8 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13</version>
+      <!-- Yes, not 'test' here -->
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <!-- Identical to lib/jdiff/jdiff.jar, a former system-scoped dependency. Now to be found on GitHub Packages. -->

diff --git a/testing/pom.xml b/testing/pom.xml
index 0f1089e1f8585c4422da03caf3081cde8a08f7a2..89877c9e97d88c2efff4be626c2ee44242c3cae7 100644 (file)
--- 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>
 

diff --git a/tests/pom.xml b/tests/pom.xml
index cc0e602a6b8cd82e4fa1e678eb4509c748091a1f..a8d5b27aab9b54996e0a89b0f1523a52ae8d38e5 100644 (file)
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -36,8 +36,7 @@
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
-                       <artifactId>runtime</artifactId>
-                       <version>${project.version}</version>
+                       <artifactId>asm-renamed</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
@@ -49,68 +48,42 @@
                        <artifactId>org.aspectj.matcher</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.aspectj</groupId>
-                       <artifactId>asm-renamed</artifactId>
-               </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>
-               </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>org.aspectj.ajdt.core</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
-               </dependency>
-               <dependency>
-                       <!-- Identical to lib/ant/lib/ant.jar, a former system-scoped dependency -->
-                       <groupId>ant</groupId>
-                       <artifactId>ant</artifactId>
-                       <version>${lib.ant.version}</version>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>ajde.core</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>bcel-builder</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</artifactId>
                        <version>${project.version}</version>
                        <type>test-jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.aspectj</groupId>
-                       <artifactId>testing-drivers</artifactId>
-                       <version>${project.version}</version>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>testing-util</artifactId>
                        <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <!-- Identical to lib/ant/lib/ant-launcher.jar, a former system-scoped dependency -->
-                       <groupId>ant</groupId>
-                       <artifactId>ant-launcher</artifactId>
-                       <version>${lib.ant.version}</version>
+                       <scope>test</scope>
                </dependency>
        </dependencies>
 

diff --git a/weaver/pom.xml b/weaver/pom.xml
index 9eaf8f3d1e27274244c1dcf5ea0b5afc6d83b690..16f2ccfd9c9e6180e23d002da1e9cdfd3aab8fd7 100644 (file)
--- a/weaver/pom.xml
+++ b/weaver/pom.xml
@@ -28,6 +28,7 @@
       <groupId>org.aspectj</groupId>
       <artifactId>testing-util</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>