From 34cda077348a5af1f9ec85b60803bb067ef33d38 Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Sat, 10 Apr 2021 12:45:22 +0700
Subject: [PATCH] Clean up remaining references to system-scoped dependencies

Now there is no system-scoped dependency left anymore in the Maven
build, i.e. the corresponding warnings are gone and we can focus on the
actual build log.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---
 docs/pom.xml                | 80 -------------------------------------
 run-all-junit-tests/pom.xml |  9 -----
 testing-drivers/pom.xml     |  9 -----
 tests/pom.xml               | 17 --------
 weaver/pom.xml              |  9 -----
 5 files changed, 124 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 884a23b5c..9f731bbad 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -19,77 +19,6 @@
         <activeByDefault>true</activeByDefault>
       </activation>
 
-      <dependencies>
-        <!--
-            <dependency>
-              <groupId>org.aspectj</groupId>
-              <artifactId>util</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>util</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>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>org.aspectj.matcher</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>org.aspectj.matcher</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>commons</groupId>
-              <artifactId>commons</artifactId>
-              <version>1.0</version>
-              <scope>system</scope>
-              <systemPath>${project.basedir}/../lib/commons/commons.jar</systemPath>
-            </dependency>
-            <dependency>
-              <groupId>asm</groupId>
-              <artifactId>asm</artifactId>
-              <version>1.0</version>
-              <scope>system</scope>
-              <systemPath>${project.basedir}/../lib/asm/asm-9.1.renamed.jar</systemPath>
-            </dependency>
-        -->
-      </dependencies>
-
       <build>
         <resources>
           <resource>
@@ -99,15 +28,6 @@
               <include>**/local.properties</include>
             </includes>
           </resource>
-          <!--
-                <resource>
-                  <directory>src/main/resources</directory>
-                  <filtering>false</filtering>
-                  <excludes>
-                    <exclude>**/local.properties</exclude>
-                  </excludes>
-                </resource>
-          -->
         </resources>
 
         <pluginManagement>
diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml
index 22a2245e5..1b159f47e 100644
--- a/run-all-junit-tests/pom.xml
+++ b/run-all-junit-tests/pom.xml
@@ -224,15 +224,6 @@
 			<version>${project.version}</version>
 			<type>test-jar</type>
 		</dependency>
-<!--
-		<dependency>
-			<groupId>commons</groupId>
-			<artifactId>commons</artifactId>
-			<version>1.0</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/commons/commons.jar</systemPath>
-		</dependency>
--->
 		<dependency>
 			<!-- Identical to lib/ant/lib/ant.jar, a former system-scoped dependency -->
 			<groupId>ant</groupId>
diff --git a/testing-drivers/pom.xml b/testing-drivers/pom.xml
index 8268d073f..5ab5f35ec 100644
--- a/testing-drivers/pom.xml
+++ b/testing-drivers/pom.xml
@@ -55,15 +55,6 @@
       <artifactId>asm</artifactId>
       <version>${project.version}</version>
     </dependency>
-<!--
-    <dependency>
-      <groupId>commons</groupId>
-      <artifactId>commons</artifactId>
-      <version>1.0</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/../lib/commons/commons.jar</systemPath>
-    </dependency>
--->
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>testing</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index f330e5f1a..cc0e602a6 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -112,25 +112,8 @@
 			<artifactId>ant-launcher</artifactId>
 			<version>${lib.ant.version}</version>
 		</dependency>
-<!--
-		<dependency>
-			<groupId>commons</groupId>
-			<artifactId>commons</artifactId>
-			<version>1.0</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/../lib/commons/commons.jar</systemPath>
-		</dependency>
--->
-<!--
-		<dependency>
-			<groupId>commons-digester</groupId>
-			<artifactId>commons-digester</artifactId>
-			<version>${lib.commons.digester.version}</version>
-		</dependency>
--->
 	</dependencies>
 
-
 	<build>
 			<plugins>
 				<plugin>
diff --git a/weaver/pom.xml b/weaver/pom.xml
index 6bf419ab8..9eaf8f3d1 100644
--- a/weaver/pom.xml
+++ b/weaver/pom.xml
@@ -56,15 +56,6 @@
       <artifactId>bcel-builder</artifactId>
       <version>${project.version}</version>
     </dependency>
-<!--
-    <dependency>
-      <groupId>commons</groupId>
-      <artifactId>commons</artifactId>
-      <version>1.0</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/../lib/commons/commons.jar</systemPath>
-    </dependency>
--->
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>asm-renamed</artifactId>
-- 
2.39.5