Author: reschke
Date: Thu Sep 10 16:20:39 2015
New Revision: 1702292
URL: http://svn.apache.org/r1702292
Log:
OAK-2986: RDBDataSourceFactory: switch to tomcat datasource implementation
(adjust non-oak-core poms)
Modified:
jackrabbit/oak/trunk/oak-jcr/pom.xml
jackrabbit/oak/trunk/oak-run/pom.xml
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1702292&r1=1702291&r2=1702292&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Thu Sep 10 16:20:39 2015
@@ -345,10 +345,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
- <scope>test</scope>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <version>7.0.64</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1702292&r1=1702291&r2=1702292&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Thu Sep 10 16:20:39 2015
@@ -282,9 +282,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <version>7.0.64</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>com.h2database</groupId>