Author: joehni Date: Wed Dec 23 11:44:41 2009 New Revision: 893481 URL: http://svn.apache.org/viewvc?rev=893481&view=rev Log: Drop XML artifacts used in test and explicit selection of SAX driver.
Modified: commons/proper/dbcp/trunk/build.properties.sample commons/proper/dbcp/trunk/build.xml commons/proper/dbcp/trunk/pom-1.3.xml commons/proper/dbcp/trunk/pom.xml commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java Modified: commons/proper/dbcp/trunk/build.properties.sample URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.properties.sample?rev=893481&r1=893480&r2=893481&view=diff ============================================================================== --- commons/proper/dbcp/trunk/build.properties.sample (original) +++ commons/proper/dbcp/trunk/build.properties.sample Wed Dec 23 11:44:41 2009 @@ -31,10 +31,6 @@ junit.home=${repository}/junit/junit/3.8.2 junit.jar=${junit.home}/junit-3.8.2.jar -# XML parser -xerces.home=${repository}/xerces/xercesImpl/2.4.0 -xerces.jar=${xerces.home}/xercesImpl-2.4.0.jar - # Tomcat naming jars - needed only for JNDI tests naming.common.home=${repository}/tomcat/naming-common/5.0.28 naming-common.jar=${naming.common.home}/naming-common-5.0.28.jar Modified: commons/proper/dbcp/trunk/build.xml URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.xml?rev=893481&r1=893480&r2=893481&view=diff ============================================================================== --- commons/proper/dbcp/trunk/build.xml (original) +++ commons/proper/dbcp/trunk/build.xml Wed Dec 23 11:44:41 2009 @@ -46,7 +46,7 @@ <property name="classpath" value="${cp}:${commons-pool.jar}:${junit.jar}: ${naming-common.jar}:${naming-java.jar}:${commons-logging.jar}: - ${xerces.jar}:${jta-spec.jar}:${jta-impl.jar}: + ${jta-spec.jar}:${jta-impl.jar}: ${backport-util-concurrent.jar}:${ejb-spec.jar}"/> <property name="name" value="commons-dbcp"/> @@ -105,9 +105,6 @@ <param name="file" value="${commons-logging.jar}"/> </antcall> <antcall target="check_jar"> - <param name="file" value="${xerces.jar}"/> - </antcall> - <antcall target="check_jar"> <param name="file" value="${jta-spec.jar}"/> </antcall> <antcall target="check_jar"> Modified: commons/proper/dbcp/trunk/pom-1.3.xml URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom-1.3.xml?rev=893481&r1=893480&r2=893481&view=diff ============================================================================== --- commons/proper/dbcp/trunk/pom-1.3.xml (original) +++ commons/proper/dbcp/trunk/pom-1.3.xml Wed Dec 23 11:44:41 2009 @@ -163,7 +163,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>1.1.1</version> + <version>1.1</version> <optional>true</optional> </dependency> @@ -202,12 +202,12 @@ <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> - <version>2.0.2</version> + <version>1.3.04</version> <scope>test</scope> </dependency> <dependency> <groupId>xerces</groupId> - <artifactId>xerces</artifactId> + <artifactId>xercesImpl</artifactId> <version>2.4.0</version> <scope>test</scope> </dependency> Modified: commons/proper/dbcp/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=893481&r1=893480&r2=893481&view=diff ============================================================================== --- commons/proper/dbcp/trunk/pom.xml (original) +++ commons/proper/dbcp/trunk/pom.xml Wed Dec 23 11:44:41 2009 @@ -197,20 +197,6 @@ <version>1.2-beta</version> <scope>test</scope> </dependency> - - <!-- required by TestJOCLed --> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>2.0.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xerces</artifactId> - <version>2.4.0</version> - <scope>test</scope> - </dependency> </dependencies> <properties> Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java?rev=893481&r1=893480&r2=893481&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java (original) +++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java Wed Dec 23 11:44:41 2009 @@ -30,9 +30,6 @@ public class TestJOCLed extends TestConnectionPool { public TestJOCLed(String testName) { super(testName); - if(null == System.getProperty("org.xml.sax.driver")) { - System.setProperty("org.xml.sax.driver","org.apache.xerces.parsers.SAXParser"); - } } public static Test suite() {