commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joe...@apache.org
Subject svn commit: r893482 - in /commons/proper/dbcp/branches/DBCP_1_3_BRANCH: pom.xml src/test/org/apache/commons/jocl/TestJOCLContentHandler.java
Date Wed, 23 Dec 2009 11:46:34 GMT
Author: joehni
Date: Wed Dec 23 11:46:33 2009
New Revision: 893482

URL: http://svn.apache.org/viewvc?rev=893482&view=rev
Log:
Use compatible version of JTA. Use proepr version of xml-apis. Harmonize used xerces artifact
between Ant and Maven. Set SAX driver explicitly in all JOCL tests.

Modified:
    commons/proper/dbcp/branches/DBCP_1_3_BRANCH/pom.xml
    commons/proper/dbcp/branches/DBCP_1_3_BRANCH/src/test/org/apache/commons/jocl/TestJOCLContentHandler.java

Modified: commons/proper/dbcp/branches/DBCP_1_3_BRANCH/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_3_BRANCH/pom.xml?rev=893482&r1=893481&r2=893482&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_3_BRANCH/pom.xml (original)
+++ commons/proper/dbcp/branches/DBCP_1_3_BRANCH/pom.xml Wed Dec 23 11:46:33 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/branches/DBCP_1_3_BRANCH/src/test/org/apache/commons/jocl/TestJOCLContentHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_3_BRANCH/src/test/org/apache/commons/jocl/TestJOCLContentHandler.java?rev=893482&r1=893481&r2=893482&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_3_BRANCH/src/test/org/apache/commons/jocl/TestJOCLContentHandler.java
(original)
+++ commons/proper/dbcp/branches/DBCP_1_3_BRANCH/src/test/org/apache/commons/jocl/TestJOCLContentHandler.java
Wed Dec 23 11:46:33 2009
@@ -36,6 +36,9 @@
 public class TestJOCLContentHandler extends TestCase {
     public TestJOCLContentHandler(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() {



Mime
View raw message