You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2016/02/22 15:26:18 UTC
svn commit: r1731648 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
oak-parent/pom.xml
Author: reschke
Date: Mon Feb 22 14:26:18 2016
New Revision: 1731648
URL: http://svn.apache.org/viewvc?rev=1731648&view=rev
Log:
OAK-4034: RDBDocumentStore: use and require Oracle 12.1 JDBC driver
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
jackrabbit/oak/trunk/oak-parent/pom.xml
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java?rev=1731648&r1=1731647&r2=1731648&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java Mon Feb 22 14:26:18 2016
@@ -83,7 +83,7 @@ public enum RDBBlobStoreDB {
ORACLE("Oracle") {
@Override
public String checkVersion(DatabaseMetaData md) throws SQLException {
- return RDBJDBCTools.versionCheck(md, 12, 1, description);
+ return RDBJDBCTools.versionCheck(md, 12, 1, 12, 1, description);
}
@Override
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java?rev=1731648&r1=1731647&r2=1731648&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java Mon Feb 22 14:26:18 2016
@@ -193,7 +193,7 @@ public enum RDBDocumentStoreDB {
ORACLE("Oracle") {
@Override
public String checkVersion(DatabaseMetaData md) throws SQLException {
- return RDBJDBCTools.versionCheck(md, 12, 1, description);
+ return RDBJDBCTools.versionCheck(md, 12, 1, 12, 1, description);
}
@Override
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1731648&r1=1731647&r2=1731648&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Mon Feb 22 14:26:18 2016
@@ -754,14 +754,14 @@
<!-- requires local copy of Oracle JDBC driver deployed to Maven repo-->
<!-- for instance:
mvn install:install-file -Dfile=ojdbc6.jar -Dpackaging=jar\
- -DgroupId=com.oracle -DartifactId=ojdbc6 -Dversion=11.2.0.3.0
+ -DgroupId=com.oracle -DartifactId=ojdbc6 -Dversion=12.1.0.1.0
-->
<id>rdb-oracle</id>
<dependencies>
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
- <version>11.2.0.3.0</version>
+ <version>12.1.0.1.0</version>
</dependency>
</dependencies>
</profile>