SONAR-14791 - Supported MSQL and Oracle versions update

4 files changed, 17 insertions, 9 deletions

diff --git a/server/sonar-docs/src/pages/setup/lts-to-lts-upgrade-notes.md b/server/sonar-docs/src/pages/setup/lts-to-lts-upgrade-notes.md
index e13061e8570..9dc339f953a 100644
--- a/server/sonar-docs/src/pages/setup/lts-to-lts-upgrade-notes.md
+++ b/server/sonar-docs/src/pages/setup/lts-to-lts-upgrade-notes.md
@@ -79,8 +79,12 @@ The configuration of Pull Request decoration changes. Previous settings are repl
 **Plugins require risk consent (8.9)**  
 When upgrading, if you're using plugins, a SonarQube administrator needs to acknowledge the risk involved with plugin installation when prompted in SonarQube. ([MMF-2301](https://jira.sonarsource.com/browse/MMF-2301)).
 
-**PostgreSQL support (8.9)**  
-SonarQube 8.9 only supports PostgreSQL versions 9.6 to 13. PostgreSQL versions <9.6 are no longer supported.
+**Database support updated (8.9)**  
+SonarQube 8.9 supports the following database versions:
+
+* PostgreSQL versions 9.6 to 13. PostgreSQL versions <9.6 are no longer supported.
+* MSSQL Server 2014, 2016, 2017, and 2019.
+* Oracle XE, 12C, 18C, and 19C. Oracle 11G is no longer supported.
 
 **Webhooks aren't allowed to target the instance (8.9)**  
 To improve security, webhooks, by default, aren't allowed to point to the SonarQube server. You can change this behavior in the configuration. ([SONAR-14682](https://jira.sonarsource.com/browse/SONAR-14682)).
diff --git a/server/sonar-docs/src/pages/setup/sonar-properties.md b/server/sonar-docs/src/pages/setup/sonar-properties.md
index 5669b71ae39..9b2a7e3be7f 100644
--- a/server/sonar-docs/src/pages/setup/sonar-properties.md
+++ b/server/sonar-docs/src/pages/setup/sonar-properties.md
@@ -22,17 +22,17 @@ Permissions to create tables, indices, and triggers must be granted to JDBC user
 **`SONAR_EMBEDDEDDATABASE_PORT=9092`**  
 H2 embedded database server listening port, defaults to 9092.  
 
-### Oracle 11g/12c/18c/19c
+### Oracle 12c/18c/19c
 
 **`SONAR_JDBC_URL=jdbc:oracle:thin:@localhost:1521/XE`**  
 The Oracle JDBC driver must be copied into the directory extensions/jdbc-driver/oracle/. Only the thin client is supported, and we recommend using the latest Oracle JDBC driver. 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.
 
-### PostgreSQL 9.3 or greater
+### PostgreSQL 9.6 or greater
 
 **`SONAR_JDBC_URL=jdbc:postgresql://localhost/sonarqube?currentSchema=my_schema`**  
 By default the schema named "public" is used. It can be overridden with the parameter "currentSchema".
 
-### Microsoft SQLServer 2014/2016/2017 and SQL Azure
+### Microsoft SQLServer 2014/2016/2017/2019 and SQL Azure
 
 **`SONAR_JDBC_URL=jdbc:sqlserver://localhost;databaseName=sonar;integratedSecurity=true`**  
 A database named sonar must exist and its collation must be case-sensitive (CS) and accent-sensitive (AS). Use this connection string if you want to use integrated security with Microsoft Sql Server. Do not set the `SONAR_JDBC_USERNAME` or `SONAR_JDBC_PASSWORD` property if you are using Integrated Security. 
diff --git a/server/sonar-docs/src/pages/setup/upgrade-notes.md b/server/sonar-docs/src/pages/setup/upgrade-notes.md
index 590837efd0d..c5729309730 100644
--- a/server/sonar-docs/src/pages/setup/upgrade-notes.md
+++ b/server/sonar-docs/src/pages/setup/upgrade-notes.md
@@ -12,8 +12,12 @@ SonarQube 8.9 only supports GitHub Enterprise 2.21+ for pull request decoration
 **Plugins require risk consent**  
 When upgrading, if you're using plugins, a SonarQube administrator needs to acknowledge the risk involved with plugin installation when prompted in SonarQube. ([MMF-2301](https://jira.sonarsource.com/browse/MMF-2301)).
 
-**PostgreSQL support**  
-SonarQube 8.9 only supports PostgreSQL versions 9.6 to 13. PostgreSQL versions <9.6 are no longer supported.
+**Database support updated**  
+SonarQube 8.9 supports the following database versions:
+
+* PostgreSQL versions 9.6 to 13. PostgreSQL versions <9.6 are no longer supported.
+* MSSQL Server 2014, 2016, 2017, and 2019.
+* Oracle XE, 12C, 18C, and 19C. Oracle 11G is no longer supported.
 
 **Webhooks aren't allowed to target the instance**  
 To improve security, webhooks, by default, aren't allowed to point to the SonarQube server. You can change this behavior in the configuration. ([SONAR-14682](https://jira.sonarsource.com/browse/SONAR-14682)).
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index eabff167633..b3d8002ccd3 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -23,7 +23,7 @@
 #sonar.embeddedDatabase.port=9092
 
 
-#----- Oracle 11g/12c/18c/19c
+#----- Oracle 12c/18c/19c
 # The Oracle JDBC driver must be copied into the directory extensions/jdbc-driver/oracle/.
 # Only the thin client is supported, and we recommend using the latest Oracle JDBC driver. See
 # https://jira.sonarsource.com/browse/SONAR-9758 for more details.
@@ -36,7 +36,7 @@
 #sonar.jdbc.url=jdbc:postgresql://localhost/sonarqube?currentSchema=my_schema
 
 
-#----- Microsoft SQLServer 2014/2016/2017 and SQL Azure
+#----- Microsoft SQLServer 2014/2016/2017/2019 and SQL Azure
 # A database named sonar must exist and its collation must be case-sensitive (CS) and accent-sensitive (AS)
 # Use the following connection string if you want to use integrated security with Microsoft Sql Server
 # Do not set sonar.jdbc.username or sonar.jdbc.password property if you are using Integrated Security