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>

diff --git a/docs/pom.xml b/docs/pom.xml
index 884a23b5ca5dafa01e683d2b69e4a9a6b642b3ac..9f731bbadf366896475da33d7f2d04e399d5fcef 100644 (file)
--- 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 22a2245e54fae5ee2a70e49aa9c3526d95427a3d..1b159f47ef86a9131106c74b0af0a13028c1be9c 100644 (file)
--- 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 8268d073f81fa2453ba87d8e0c211e98edfe4151..5ab5f35ec4a4f088e18c27f8d39008304634d95f 100644 (file)
--- 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 f330e5f1ae893bf6f6cb08f0090aa9e9358db999..cc0e602a6b8cd82e4fa1e678eb4509c748091a1f 100644 (file)
--- 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 6bf419ab8fb55a049b93f78ce498c819520f2a80..9eaf8f3d1e27274244c1dcf5ea0b5afc6d83b690 100644 (file)
--- 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>