SONAR-9758 Support Oracle JDBC driver 12.2.0.1.0

diff --git a/pom.xml b/pom.xml
index ad4bb79ded17d75874e9cd8328095e038f9563c6..418eb4e7a2e7cbbd9ff7305f54064104fe82e3ca 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -886,12 +886,14 @@
         <version>5.1.42</version>
       </dependency>
       <dependency>
-        <groupId>com.oracle</groupId>
-        <artifactId>ojdbc6</artifactId>
-        <!-- SonarSource internal tests: -->
-        <!-- This version should be the same as at http://infra.internal.sonarsource.com/jenkins/orch-oracle*.properties -->
-        <version>11.2.0.3.0</version>
-      </dependency>
+        <groupId>com.oracle.jdbc</groupId>
+        <artifactId>ojdbc8</artifactId>
+        <!--
+             This version is compatible with Oracle 11g and 12c :
+             http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-faq-090281.html#01_02
+        -->
+        <version>12.2.0.1.0</version>
+     </dependency>
       <dependency>
         <groupId>org.postgresql</groupId>
         <artifactId>postgresql</artifactId>

diff --git a/server/pom.xml b/server/pom.xml
index 6e66e967f744e3f1adf962ca861c6968e3fa6386..0666069e5400ae648010323d736f21aaa2b9c984 100644 (file)
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -50,8 +50,8 @@
           <artifactId>postgresql</artifactId>
         </dependency>
         <dependency>
-          <groupId>com.oracle</groupId>
-          <artifactId>ojdbc6</artifactId>
+          <groupId>com.oracle.jdbc</groupId>
+          <artifactId>ojdbc8</artifactId>
         </dependency>
       </dependencies>
     </profile>

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 083c9a6df1810cf93037a0669e4abecbd29bf439..dbc2994af1bd7e01f10a615b25a2fe0495408125 100644 (file)
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -25,10 +25,10 @@
 
 
 #----- Oracle 11g/12c
-# - Only thin client is supported
-# - Only versions 11.2.x and 12.x of Oracle JDBC driver are supported
-# - The JDBC driver must be copied into the directory extensions/jdbc-driver/oracle/
-# - If you need to set the schema, please refer to http://jira.sonarsource.com/browse/SONAR-5000
+# The Oracle JDBC driver must be copied into the directory extensions/jdbc-driver/oracle/.
+# Only the thin client is supported, and only the versions 11.2.x or 12.2.x must be used. See
+# https://jira.sonarsource.com/browse/SONAR-9758 for more details.
+# If you need to set the schema, please refer to http://jira.sonarsource.com/browse/SONAR-5000
 #sonar.jdbc.url=jdbc:oracle:thin:@localhost:1521/XE
 
 

diff --git a/tests/pom.xml b/tests/pom.xml
index 000477c8eb26a679f9a4267456560e66f1d4bedf..f15b74f0fa382ef80dfee9368ca8d48c805b2306 100644 (file)
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -210,8 +210,8 @@
       </activation>
       <dependencies>
         <dependency>
-          <groupId>com.oracle</groupId>
-          <artifactId>ojdbc6</artifactId>
+          <groupId>com.oracle.jdbc</groupId>
+          <artifactId>ojdbc8</artifactId>
         </dependency>
       </dependencies>
     </profile>