diff options
Diffstat (limited to 'testing')
6 files changed, 9 insertions, 12 deletions
diff --git a/testing/pom.xml b/testing/pom.xml index 80d3bf16b..91e175fb0 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -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> diff --git a/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java index 3769f9326..6be56d2c9 100644 --- a/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java +++ b/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/MakeTestClass.java b/testing/src/test/java/org/aspectj/testing/MakeTestClass.java index 91cee0ea2..2a55adff7 100644 --- a/testing/src/test/java/org/aspectj/testing/MakeTestClass.java +++ b/testing/src/test/java/org/aspectj/testing/MakeTestClass.java @@ -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 diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java index 440bd9821..fa164313e 100644 --- a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java +++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java index af822c478..078624b98 100644 --- a/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java +++ b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java b/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java index 46352a0a2..6e3584c46 100644 --- a/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java +++ b/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java @@ -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 { } } - - - |