diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-03-29 09:57:56 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-03-29 13:52:01 +0700 |
| commit | d574f1c039c92108fd0845f7c6775588b69041a0 (patch) | |
| tree | b29c2947788369ef7af89365552e0346b0574600 | |
| parent | ea78c80177c79edc1426f8d573b04fd26ec6e53b (diff) | |
| download | aspectj-d574f1c039c92108fd0845f7c6775588b69041a0.tar.gz aspectj-d574f1c039c92108fd0845f7c6775588b69041a0.zip | |
Replace Ant and Xerces system-scopes libraries by normal dependencies
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
| -rw-r--r-- | build/pom.xml | 5 | ||||
| -rw-r--r-- | libx/pom.xml | 15 | ||||
| -rw-r--r-- | loadtime/pom.xml | 27 | ||||
| -rw-r--r-- | pom.xml | 13 | ||||
| -rw-r--r-- | run-all-junit-tests/pom.xml | 10 | ||||
| -rw-r--r-- | taskdefs/pom.xml | 21 | ||||
| -rw-r--r-- | testing/pom.xml | 32 | ||||
| -rw-r--r-- | tests/pom.xml | 10 |
8 files changed, 60 insertions, 73 deletions
diff --git a/build/pom.xml b/build/pom.xml index 61610af7d..fe6b41cb0 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -21,11 +21,10 @@ </dependency> <dependency> + <!-- Identical to lib/ant/lib/ant.jar, a former system-scoped dependency --> <groupId>ant</groupId> <artifactId>ant</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/ant.jar</systemPath> + <version>${lib.ant.version}</version> </dependency> </dependencies> diff --git a/libx/pom.xml b/libx/pom.xml index 00b3a2eae..987ae1d11 100644 --- a/libx/pom.xml +++ b/libx/pom.xml @@ -12,9 +12,8 @@ <artifactId>libx</artifactId> <properties> - <ant.name>apache-ant</ant.name> - <ant.version>1.6.3</ant.version> - <ant.artifact>${ant.name}-${ant.version}</ant.artifact> + <lib.ant.name>apache-ant</lib.ant.name> + <lib.ant.artifact>${lib.ant.name}-${lib.ant.version}</lib.ant.artifact> </properties> <build> @@ -32,7 +31,7 @@ <goal>wget</goal> </goals> <configuration> - <url>https://archive.apache.org/dist/ant/binaries/${ant.artifact}-bin.zip</url> + <url>https://archive.apache.org/dist/ant/binaries/${lib.ant.artifact}-bin.zip</url> <outputDirectory>ant</outputDirectory> <sha1>3fa9f816a0c4c63249efad8e6225f2e83794f0c0</sha1> </configuration> @@ -44,7 +43,7 @@ <goal>wget</goal> </goals> <configuration> - <url>https://archive.apache.org/dist/ant/source/${ant.artifact}-src.zip</url> + <url>https://archive.apache.org/dist/ant/source/${lib.ant.artifact}-src.zip</url> <outputDirectory>ant</outputDirectory> <sha1>b9f3c8c31bb6c9069ad5b655059a17769af12f20</sha1> </configuration> @@ -165,7 +164,7 @@ <!-- Binary is identical to committed version --> <groupId>regexp</groupId> <artifactId>regexp</artifactId> - <version>1.2</version> + <version>${lib.regexp.version}</version> <type>jar</type> <overWrite>false</overWrite> <outputDirectory>regexp</outputDirectory> @@ -210,7 +209,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>ant/${ant.artifact}-bin.zip/${ant.artifact}</directory> + <directory>ant/${lib.ant.artifact}-bin.zip/${lib.ant.artifact}</directory> <outputDirectory>ant</outputDirectory> </fileset> </configuration> @@ -249,7 +248,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>ant/${ant.artifact}-src.zip/${ant.artifact}/src/main</directory> + <directory>ant/${lib.ant.artifact}-src.zip/${lib.ant.artifact}/src/main</directory> <outputDirectory>ant/ant-src.zip</outputDirectory> </fileset> </configuration> diff --git a/loadtime/pom.xml b/loadtime/pom.xml index 91a850ef7..5b19cb73c 100644 --- a/loadtime/pom.xml +++ b/loadtime/pom.xml @@ -55,18 +55,16 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/xml-apis.jar</systemPath> + <!-- 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> - <groupId>xercesImpl</groupId> + <!-- Identical to lib/ant/lib/xercesImpl.jar, a former system-scoped dependency --> + <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/xercesImpl.jar</systemPath> + <version>${lib.ant.xerces.version}</version> </dependency> <dependency> <groupId>jrockit</groupId> @@ -75,17 +73,16 @@ <scope>system</scope> <systemPath>${project.basedir}/../lib/ext/jrockit/jrockit.jar</systemPath> </dependency> - + <dependency> - <groupId>ant</groupId> + <!-- Identical to lib/ant/lib/ant.jar, a former system-scoped dependency --> + <groupId>ant</groupId> <artifactId>ant</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/ant.jar</systemPath> + <version>${lib.ant.version}</version> </dependency> </dependencies> -<!-- +<!-- <build> <plugins> <plugin> @@ -4,17 +4,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <properties> - <revision>1.9.7.BUILD-SNAPSHOT</revision> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <groupId>org.aspectj</groupId> <artifactId>aspectj-parent</artifactId> <packaging>pom</packaging> <version>1.9.7.BUILD-SNAPSHOT</version> <name>AspectJ Parent Project</name> + <properties> + <revision>1.9.7.BUILD-SNAPSHOT</revision> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <lib.ant.version>1.6.3</lib.ant.version> + <lib.ant.xerces.version>2.6.2</lib.ant.xerces.version> + <lib.regexp.version>1.2</lib.regexp.version> + </properties> + <modules> <module>util</module> <module>bridge</module> diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml index 03c33151e..a6407370d 100644 --- a/run-all-junit-tests/pom.xml +++ b/run-all-junit-tests/pom.xml @@ -235,11 +235,10 @@ <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> <artifactId>ant</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/ant.jar</systemPath> + <version>${lib.ant.version}</version> </dependency> <dependency> <groupId>org.aspectj</groupId> @@ -263,11 +262,10 @@ <systemPath>${project.basedir}/../lib/jdiff/jdiff.jar</systemPath> </dependency> <dependency> + <!-- Identical to lib/ant/lib/ant-launcher.jar, a former system-scoped dependency --> <groupId>ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/ant-launcher.jar</systemPath> + <version>${lib.ant.version}</version> </dependency> </dependencies> diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml index b686fa663..74abf20a6 100644 --- a/taskdefs/pom.xml +++ b/taskdefs/pom.xml @@ -35,25 +35,22 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/xml-apis.jar</systemPath> + <!-- 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> - <groupId>xercesImpl</groupId> + <!-- Identical to lib/ant/lib/xercesImpl.jar, a former system-scoped dependency --> + <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/xercesImpl.jar</systemPath> + <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>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/ant.jar</systemPath> + <version>${lib.ant.version}</version> </dependency> </dependencies> </project> diff --git a/testing/pom.xml b/testing/pom.xml index d0c20be24..bbbe67319 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -92,18 +92,16 @@ <systemPath>${project.basedir}/../lib/jdiff/jdiff.jar</systemPath> </dependency> <dependency> + <!-- Identical to lib/ant/lib/ant.jar, a former system-scoped dependency --> <groupId>ant</groupId> <artifactId>ant</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/ant.jar</systemPath> + <version>${lib.ant.version}</version> </dependency> <dependency> - <groupId>jakarta-regexp</groupId> - <artifactId>jakarta-regexp</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/regexp/jakarta-regexp-1.2.jar</systemPath> + <!-- 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> @@ -118,18 +116,16 @@ <type>test-jar</type> </dependency> <dependency> - <groupId>xercesImpl</groupId> - <artifactId>xercesImpl</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/xercesImpl.jar</systemPath> + <!-- 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> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/xml-apis.jar</systemPath> + <!-- 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> diff --git a/tests/pom.xml b/tests/pom.xml index 01a890f36..f325b7bd2 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -75,11 +75,10 @@ <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>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/ant.jar</systemPath> + <version>${lib.ant.version}</version> </dependency> <dependency> <groupId>org.aspectj</groupId> @@ -114,11 +113,10 @@ <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>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/ant-launcher.jar</systemPath> + <version>${lib.ant.version}</version> </dependency> <dependency> <groupId>commons</groupId> |