Replace system-scoped dependency on commons by granular dependencies

There are only two direct dependencies used in AspectJ code:
  - Commons Digester (module 'testing')
  - Commons Logging (module 'org.aspectj.matcher')

I declared those two and experimentally removed all the other
system-scoped dependencies, as it should be. Let's see if the build
works with transitive dependencies.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

1 files changed, 19 insertions, 19 deletions

diff --git a/libx/pom.xml b/libx/pom.xml
index fcd092162..27d3ce767 100644
--- a/libx/pom.xml
+++ b/libx/pom.xml
@@ -55,9 +55,9 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>https://github.com/apache/commons-beanutils/archive/refs/tags/BEANUTILS_1_4.zip</url>
+              <url>https://github.com/apache/commons-beanutils/archive/refs/tags/${lib.commons.beanutils.tag}.zip</url>
               <outputDirectory>commons</outputDirectory>
-              <outputFileName>commons-beanutils-1.4-sources.jar</outputFileName>
+              <outputFileName>commons-beanutils-${lib.commons.beanutils.version}-sources.jar</outputFileName>
               <sha1>b2c02afe7e6475cd7c811932b8415d171a8afa00</sha1>
             </configuration>
           </execution>
@@ -81,9 +81,9 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>https://github.com/apache/commons-digester/archive/refs/tags/DIGESTER_1_3.zip</url>
+              <url>https://github.com/apache/commons-digester/archive/refs/tags/${lib.commons.digester.tag}.zip</url>
               <outputDirectory>commons</outputDirectory>
-              <outputFileName>commons-digester-1.3-sources.jar</outputFileName>
+              <outputFileName>commons-digester-${lib.commons.digester.version}-sources.jar</outputFileName>
               <sha1>49f653c7ea726301c564f9662b72c051fee9390a</sha1>
             </configuration>
           </execution>
@@ -94,9 +94,9 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>https://github.com/apache/commons-logging/archive/refs/tags/LOGGING_1_0_1.zip</url>
+              <url>https://github.com/apache/commons-logging/archive/refs/tags/${lib.commons.logging.tag}.zip</url>
               <outputDirectory>commons</outputDirectory>
-              <outputFileName>commons-logging-1.0.1-sources.jar</outputFileName>
+              <outputFileName>commons-logging-${lib.commons.logging.version}-sources.jar</outputFileName>
               <sha1>c61a373f6d50ff8fcfba900934f7254d44f9735b</sha1>
             </configuration>
           </execution>
@@ -238,11 +238,11 @@
                   <!-- TODO: not used anywhere -> remove -->
                   <groupId>commons-beanutils</groupId>
                   <artifactId>commons-beanutils</artifactId>
-                  <version>1.4</version>
+                  <version>${lib.commons.beanutils.version}</version>
                   <type>jar</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>commons</outputDirectory>
-                  <destFileName>commons-beanutils-1.4.jar</destFileName>
+                  <destFileName>commons-beanutils-${lib.commons.beanutils.version}.jar</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <!-- Binary is identical to committed version -->
@@ -260,22 +260,22 @@
                   <!-- TODO: used in module 'testing' -->
                   <groupId>commons-digester</groupId>
                   <artifactId>commons-digester</artifactId>
-                  <version>1.3</version>
+                  <version>${lib.commons.digester.version}</version>
                   <type>jar</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>commons</outputDirectory>
-                  <destFileName>commons-digester-1.3.jar</destFileName>
+                  <destFileName>commons-digester-${lib.commons.digester.version}.jar</destFileName>
                 </artifactItem>
                 <artifactItem>
                   <!-- Binary is identical to committed version -->
-                  <!-- TODO: used in modules 'org.aspectj.matcher', 'testing'   -->
+                  <!-- TODO: used in modules 'org.aspectj.matcher' -->
                   <groupId>commons-logging</groupId>
                   <artifactId>commons-logging</artifactId>
-                  <version>1.0.1</version>
+                  <version>${lib.commons.logging.version}</version>
                   <type>jar</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>commons</outputDirectory>
-                  <destFileName>commons-logging-1.0.1.jar</destFileName>
+                  <destFileName>commons-logging-${lib.commons.logging.version}.jar</destFileName>
                 </artifactItem>
 
               </artifactItems>
@@ -395,7 +395,7 @@
                       This is why we use the TrueZIP plugin: It can seamlessly copy out of or into ZIP files as if they
                       were normal file system paths. No additional moves and deletes with Antrun are necessary.
                     -->
-                    <directory>commons/commons-beanutils-1.4.jar</directory>
+                    <directory>commons/commons-beanutils-${lib.commons.beanutils.version}.jar</directory>
                     <outputDirectory>commons/commons.jar</outputDirectory>
                   </fileset>
                 </configuration>
@@ -431,7 +431,7 @@
                       This is why we use the TrueZIP plugin: It can seamlessly copy out of or into ZIP files as if they
                       were normal file system paths. No additional moves and deletes with Antrun are necessary.
                     -->
-                    <directory>commons/commons-digester-1.3.jar</directory>
+                    <directory>commons/commons-digester-${lib.commons.digester.version}.jar</directory>
                     <outputDirectory>commons/commons.jar</outputDirectory>
                   </fileset>
                 </configuration>
@@ -449,7 +449,7 @@
                       This is why we use the TrueZIP plugin: It can seamlessly copy out of or into ZIP files as if they
                       were normal file system paths. No additional moves and deletes with Antrun are necessary.
                     -->
-                    <directory>commons/commons-logging-1.0.1.jar</directory>
+                    <directory>commons/commons-logging-${lib.commons.logging.version}.jar</directory>
                     <outputDirectory>commons/commons.jar</outputDirectory>
                   </fileset>
                 </configuration>
@@ -488,7 +488,7 @@
                       This is why we use the TrueZIP plugin: It can seamlessly copy out of or into ZIP files as if they
                       were normal file system paths. No additional moves and deletes with Antrun are necessary.
                     -->
-                    <directory>commons/commons-beanutils-1.4-sources.jar/commons-beanutils-BEANUTILS_1_4/src/java</directory>
+                    <directory>commons/commons-beanutils-${lib.commons.beanutils.version}-sources.jar/commons-beanutils-${lib.commons.beanutils.tag}/src/java</directory>
                     <outputDirectory>commons/commons-src.zip</outputDirectory>
                   </fileset>
                 </configuration>
@@ -524,7 +524,7 @@
                       This is why we use the TrueZIP plugin: It can seamlessly copy out of or into ZIP files as if they
                       were normal file system paths. No additional moves and deletes with Antrun are necessary.
                     -->
-                    <directory>commons/commons-digester-1.3-sources.jar/commons-digester-DIGESTER_1_3/src/java</directory>
+                    <directory>commons/commons-digester-${lib.commons.digester.version}-sources.jar/commons-digester-${lib.commons.digester.tag}/src/java</directory>
                     <outputDirectory>commons/commons-src.zip</outputDirectory>
                   </fileset>
                 </configuration>
@@ -542,7 +542,7 @@
                       This is why we use the TrueZIP plugin: It can seamlessly copy out of or into ZIP files as if they
                       were normal file system paths. No additional moves and deletes with Antrun are necessary.
                     -->
-                    <directory>commons/commons-logging-1.0.1-sources.jar/commons-logging-LOGGING_1_0_1/src/java</directory>
+                    <directory>commons/commons-logging-${lib.commons.logging.version}-sources.jar/commons-logging-${lib.commons.logging.tag}/src/java</directory>
                     <outputDirectory>commons/commons-src.zip</outputDirectory>
                   </fileset>
                 </configuration>