mirrors
/
org.aspectj
peilaus alkaen https://github.com/eclipse/org.aspectj.git
Tarkkaile 1
Äänestä 0
Fork 0
Koodi Ongelmat 0 Julkaisut 138 Wiki Activity
Selaa lähdekoodia

Remove Apache Commons from 'lib' module, update remaining dependencies 

Of beanutils, collections, digester and logging actually only digester
and logging are directly used in AspectJ code. Therefore, remove the
unused ones and upgrade the remaining libraries' versions to ones which
also have source JARs on Maven Central. This makes downloading sources
from GitHub and packaging separate commons.jar and commons-src.zip
artifacts superfluous. Hence, we can get rid of them completely.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
tags/V1_9_22
Alexander Kriegisch 1 kuukausi sitten
vanhempi
b8447ab23c
commit
acdc285883
10 muutettua tiedostoa jossa 12 lisäystä ja 250 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 0
    1
      .gitignore
  2. 0
    222
      lib/pom.xml
  3. 1
    1
      org.aspectj.matcher/pom.xml
  4. 2
    14
      pom.xml
  5. 4
    4
      testing/pom.xml
  6. 1
    1
      testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java
  7. 1
    1
      testing/src/test/java/org/aspectj/testing/MakeTestClass.java
  8. 1
    1
      testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java
  9. 1
    1
      testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java
  10. 1
    4
      testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java

+ 0
- 1
.gitignore Näytä tiedosto

@@ -34,7 +34,6 @@ bin/
# Downloaded libraries used during tests + marker file
/lib/provisioned.marker
/lib/ant/
/lib/commons/
/lib/jarjar/
/lib/jdtcore-aj/
/lib/junit/

+ 0
- 222
lib/pom.xml Näytä tiedosto

@@ -87,58 +87,6 @@
<sha1>b9f3c8c31bb6c9069ad5b655059a17769af12f20</sha1>
</configuration>
</execution>
<execution>
<id>download-beanutils-sources</id>
<phase>generate-resources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>https://github.com/apache/commons-beanutils/archive/refs/tags/${lib.commons.beanutils.tag}.zip</url>
<outputDirectory>commons</outputDirectory>
<outputFileName>commons-beanutils-${lib.commons.beanutils.version}-sources.jar</outputFileName>
<sha1>b2c02afe7e6475cd7c811932b8415d171a8afa00</sha1>
</configuration>
</execution>
<execution>
<id>download-collections-sources</id>
<phase>generate-resources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>https://github.com/apache/commons-collections/archive/refs/tags/${lib.commons.collections.tag}.zip</url>
<outputDirectory>commons</outputDirectory>
<outputFileName>commons-collections-${lib.commons.collections.version}-sources.jar</outputFileName>
<sha1>824cacd0aafe21a94fb142388fd62f28a12df5ef</sha1>
</configuration>
</execution>
<execution>
<id>download-digester-sources</id>
<phase>generate-resources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>https://github.com/apache/commons-digester/archive/refs/tags/${lib.commons.digester.tag}.zip</url>
<outputDirectory>commons</outputDirectory>
<outputFileName>commons-digester-${lib.commons.digester.version}-sources.jar</outputFileName>
<sha1>49f653c7ea726301c564f9662b72c051fee9390a</sha1>
</configuration>
</execution>
<execution>
<id>download-logging-sources</id>
<phase>generate-resources</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>https://github.com/apache/commons-logging/archive/refs/tags/${lib.commons.logging.tag}.zip</url>
<outputDirectory>commons</outputDirectory>
<outputFileName>commons-logging-${lib.commons.logging.version}-sources.jar</outputFileName>
<sha1>c61a373f6d50ff8fcfba900934f7254d44f9735b</sha1>
</configuration>
</execution>
</executions>
</plugin>

@@ -231,62 +179,6 @@
<destFileName>jakarta-regexp-1.2.jar</destFileName>
</artifactItem>

<!--
About commons.jar + commons-src.zip:
- Beanutils Binaries are commons-beanutils:commons-beanutils:1.4 (no sources on Maven Central, but
https://github.com/apache/commons-beanutils/archive/refs/tags/BEANUTILS_1_4.zip)
- Collections: Binaries are commons-collections:commons-collections:2.0 (no sources on Maven Central, but
https://github.com/apache/commons-collections/archive/refs/tags/collections-2.0.zip)
- Digester: Binaries are commons-digester:commons-digester:1.3 (no sources on Maven Central, but
https://github.com/apache/commons-digester/archive/refs/tags/DIGESTER_1_3.zip)
- Logging: Binaries are commons-logging:commons-logging:1.0.1 (no sources on Maven Central, but
https://github.com/apache/commons-logging/archive/refs/tags/LOGGING_1_0_1.zip)
-->
<artifactItem>
<!-- Binary is identical to committed version -->
<!-- TODO: not used anywhere -> remove -->
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${lib.commons.beanutils.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>commons</outputDirectory>
<destFileName>commons-beanutils-${lib.commons.beanutils.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<!-- Binary is identical to committed version -->
<!-- TODO: not used anywhere -> remove -->
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>2.0</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>commons</outputDirectory>
<destFileName>commons-collections-2.0.jar</destFileName>
</artifactItem>
<artifactItem>
<!-- Binary is identical to committed version -->
<!-- TODO: used in module 'testing' -->
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>${lib.commons.digester.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>commons</outputDirectory>
<destFileName>commons-digester-${lib.commons.digester.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<!-- Binary is identical to committed version -->
<!-- TODO: used in modules 'org.aspectj.matcher' -->
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${lib.commons.logging.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>commons</outputDirectory>
<destFileName>commons-logging-${lib.commons.logging.version}.jar</destFileName>
</artifactItem>

</artifactItems>
</configuration>
</execution>
@@ -330,118 +222,6 @@
</fileset>
</configuration>
</execution>
<execution>
<id>zip-beanutils-binaries</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<verbose>true</verbose>
<fileset>
<directory>commons/commons-beanutils-${lib.commons.beanutils.version}.jar</directory>
<outputDirectory>commons/commons.jar</outputDirectory>
</fileset>
</configuration>
</execution>
<execution>
<id>zip-collections-binaries</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<verbose>true</verbose>
<fileset>
<directory>commons/commons-collections-${lib.commons.collections.version}.jar</directory>
<outputDirectory>commons/commons.jar</outputDirectory>
</fileset>
</configuration>
</execution>
<execution>
<id>zip-digester-binaries</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<verbose>true</verbose>
<fileset>
<directory>commons/commons-digester-${lib.commons.digester.version}.jar</directory>
<outputDirectory>commons/commons.jar</outputDirectory>
</fileset>
</configuration>
</execution>
<execution>
<id>zip-logging-binaries</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<verbose>true</verbose>
<fileset>
<directory>commons/commons-logging-${lib.commons.logging.version}.jar</directory>
<outputDirectory>commons/commons.jar</outputDirectory>
</fileset>
</configuration>
</execution>
<execution>
<id>zip-beanutils-sources</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<verbose>true</verbose>
<fileset>
<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>
</execution>
<execution>
<id>zip-collections-sources</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<verbose>true</verbose>
<fileset>
<directory>commons/commons-collections-${lib.commons.collections.version}-sources.jar/commons-collections-${lib.commons.collections.tag}/src/java</directory>
<outputDirectory>commons/commons-src.zip</outputDirectory>
</fileset>
</configuration>
</execution>
<execution>
<id>zip-digester-sources</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<verbose>true</verbose>
<fileset>
<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>
</execution>
<execution>
<id>zip-logging-sources</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<verbose>true</verbose>
<fileset>
<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>
</execution>
</executions>
</plugin>

@@ -505,7 +285,6 @@
<includes>
<include>${lib.provisioned.marker}</include>
<include>ant/**</include>
<include>commons/**</include>
<include>jarjar/**</include>
<include>jdtcore-aj/**</include>
<include>junit/**</include>
@@ -555,7 +334,6 @@
<file>${lib.provisioned.marker}</file>
<file>ant/bin/ant.bat</file>
<file>ant/lib/junit.jar</file>
<file>commons/commons.jar</file>
<file>jarjar/jarjar-1.3.jar</file>
<file>jdtcore-aj/jdtcore-for-aspectj.jar</file>
<file>junit/junit.jar</file>

+ 1
- 1
org.aspectj.matcher/pom.xml Näytä tiedosto

@@ -31,7 +31,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${lib.commons.logging.version}</version>
<version>${commons.logging.version}</version>
</dependency>
</dependencies>


+ 2
- 14
pom.xml Näytä tiedosto

@@ -29,17 +29,11 @@
<!-- Dependency versions -->
<jdt.core.version>1.9.21.1</jdt.core.version> <!-- AspectJ_JDK_Update -->
<asm.version>9.6</asm.version> <!-- AspectJ_JDK_Update -->
<commons.digester.version>3.2</commons.digester.version>
<commons.logging.version>1.3.0</commons.logging.version>
<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>
<lib.commons.beanutils.version>1.4</lib.commons.beanutils.version>
<lib.commons.beanutils.tag>BEANUTILS_1_4</lib.commons.beanutils.tag>
<lib.commons.collections.version>2.0</lib.commons.collections.version>
<lib.commons.collections.tag>collections-2.0</lib.commons.collections.tag>
<lib.commons.digester.version>1.3</lib.commons.digester.version>
<lib.commons.digester.tag>DIGESTER_1_3</lib.commons.digester.tag>
<lib.commons.logging.version>1.0.1</lib.commons.logging.version>
<lib.commons.logging.tag>LOGGING_1_0_1</lib.commons.logging.tag>
</properties>

<distributionManagement>
@@ -628,12 +622,6 @@
<artifactId>org.eclipse.jdt.core</artifactId>
<version>${jdt.core.version}</version>
</dependency>
<dependency>
<!-- Because commons-digester:commons-digester:1.3 refers to version 1.4-dev -->
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${lib.commons.beanutils.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>

+ 4
- 4
testing/pom.xml Näytä tiedosto

@@ -111,9 +111,9 @@
<version>${lib.ant.xerces.version}</version>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>${lib.commons.digester.version}</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-digester3</artifactId>
<version>${commons.digester.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
@@ -123,7 +123,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${lib.commons.logging.version}</version>
<version>${commons.logging.version}</version>
</dependency>
</dependencies>


+ 1
- 1
testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java Näytä tiedosto

@@ -15,7 +15,7 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;

import org.apache.commons.digester.Digester;
import org.apache.commons.digester3.Digester;
import org.aspectj.tools.ajc.Ajc;

import junit.extensions.TestSetup;

+ 1
- 1
testing/src/test/java/org/aspectj/testing/MakeTestClass.java Näytä tiedosto

@@ -12,7 +12,7 @@ import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.List;

import org.apache.commons.digester.Digester;
import org.apache.commons.digester3.Digester;

/**
* @author colyer

+ 1
- 1
testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java Näytä tiedosto

@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.Stack;

import junit.framework.TestCase;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester3.Digester;
import org.aspectj.apache.bcel.classfile.Attribute;
import org.aspectj.apache.bcel.classfile.JavaClass;
import org.aspectj.apache.bcel.classfile.LocalVariable;

+ 1
- 1
testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java Näytä tiedosto

@@ -23,7 +23,7 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;

import org.apache.commons.digester.Digester;
import org.apache.commons.digester3.Digester;
import org.aspectj.bridge.AbortException;
import org.aspectj.bridge.IMessage;
import org.aspectj.bridge.ISourceLocation;

+ 1
- 4
testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java Näytä tiedosto

@@ -20,7 +20,7 @@ import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;

import org.apache.commons.digester.Digester;
import org.apache.commons.digester3.Digester;
import org.aspectj.bridge.AbortException;
import org.aspectj.bridge.IMessage;
import org.aspectj.bridge.ISourceLocation;
@@ -210,6 +210,3 @@ public class MessageListXmlReader {
}

}




Write Preview
Loading…
Peruuta
Tallenna