SONAR-15679 updated jdbc drivers

diff --git a/build.gradle b/build.gradle
index b319bfcf7b73db53d53529c8f90f1ca4aaf319e6..09a6d68b77c80d336bdb53f9abc2c8ce278ff5a0 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -328,8 +328,8 @@ subprojects {
       dependency 'com.hazelcast:hazelcast-kubernetes:2.2.3'
       dependency 'com.ibm.icu:icu4j:3.4.4'
       // Documentation must be updated if mssql-jdbc is updated: https://github.com/SonarSource/sonarqube/commit/03e4773ebf6cba854cdcf57a600095f65f4f53e7
-      dependency 'com.microsoft.sqlserver:mssql-jdbc:9.2.0.jre11'
-      dependency 'com.oracle.database.jdbc:ojdbc8:19.3.0.0'
+      dependency 'com.microsoft.sqlserver:mssql-jdbc:9.4.1.jre11'
+      dependency 'com.oracle.database.jdbc:ojdbc8:21.4.0.0.1'
       dependency 'org.aspectj:aspectjtools:1.9.6'
       // upgrade okhttp3 dependency kotlin to get rid of not exploitable CVE-2020-29582
       dependency 'org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21'
@@ -411,7 +411,7 @@ subprojects {
         entry 'log4j-over-slf4j'
         entry 'slf4j-api'
       }
-      dependency 'org.postgresql:postgresql:42.2.19'
+      dependency 'org.postgresql:postgresql:42.3.1'
       dependency 'org.reflections:reflections:0.10.2'
       dependency 'org.simpleframework:simple:4.1.21'
       dependency 'org.sonarsource.orchestrator:sonar-orchestrator:3.36.0.63'

diff --git a/server/sonar-docs/src/pages/setup/install-server.md b/server/sonar-docs/src/pages/setup/install-server.md
index f136199adc2ec2f9bbf3db1cdbecd10eda22f5a5..a91e086f6c296cfaf24d0c7c9e13638114be9386 100644 (file)
--- a/server/sonar-docs/src/pages/setup/install-server.md
+++ b/server/sonar-docs/src/pages/setup/install-server.md
@@ -57,7 +57,7 @@ Create an empty schema and a `sonarqube` user. Grant this `sonarqube` user permi
 |
 |To use integrated security: 
 |
-|1. Download the [Microsoft SQL JDBC Driver 9.2.0 package](https://docs.microsoft.com/en-us/sql/connect/jdbc/release-notes-for-the-jdbc-driver?view=sql-server-ver15#92) and copy `mssql-jdbc_auth-9.2.0.x64.dll` to any folder in your path. 
+|1. Download the [Microsoft SQL JDBC Driver 9.4.1 package](https://docs.microsoft.com/en-us/sql/connect/jdbc/release-notes-for-the-jdbc-driver?view=sql-server-ver15#94) and copy `mssql-jdbc_auth-9.4.1.x64.dll` to any folder in your path. 
 |
 |2. **If you're running SonarQube as a Windows service,** make sure the Windows account under which the service is running has permission to connect your SQL server. The account should have `db_owner` database role membership. 
 |

diff --git a/server/sonar-docs/src/pages/setup/sonar-properties.md b/server/sonar-docs/src/pages/setup/sonar-properties.md
index b153dff95e96fc0d237a8d28e9d3366d54571450..6073c4edc3635bb26609a1d4665f9e32d92c65e3 100644 (file)
--- a/server/sonar-docs/src/pages/setup/sonar-properties.md
+++ b/server/sonar-docs/src/pages/setup/sonar-properties.md
@@ -37,7 +37,7 @@ By default the schema named "public" is used. It can be overridden with the para
 **`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. 
 
-For Integrated Security to work, you have to download the Microsoft SQL JDBC Driver 9.2.0 package [here](https://docs.microsoft.com/en-us/sql/connect/jdbc/release-notes-for-the-jdbc-driver?view=sql-server-ver15#92) and copy mssql-jdbc_auth-9.2.0.x64.dll to your path.
+For Integrated Security to work, you have to download the Microsoft SQL JDBC Driver 9.4.1 package [here](https://docs.microsoft.com/en-us/sql/connect/jdbc/release-notes-for-the-jdbc-driver?view=sql-server-ver15#94) and copy `mssql-jdbc_auth-9.4.1.x64.dll` to your path.
 
 **`SONAR_JDBC_URL=jdbc:sqlserver://localhost;databaseName=sonar`**  
 Use this connection string if you want to use SQL Auth while connecting to MS Sql Server. Set the `SONAR_JDBC_USERNAME` and `SONAR_JDBC_PASSWORD` appropriately.

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index f62ffb272d501969b201af0a8dd92aa1be9864d3..aaa8a03703ca6849b168ef1f718a7d3973036dd0 100644 (file)
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -41,8 +41,8 @@
 # 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
 # For Integrated Security to work, you have to download the Microsoft SQL JDBC Driver 9.2.0 package from
-# https://docs.microsoft.com/en-us/sql/connect/jdbc/release-notes-for-the-jdbc-driver?view=sql-server-ver15#92
-# and copy mssql-jdbc_auth-9.2.0.x64.dll to your path.
+# https://docs.microsoft.com/en-us/sql/connect/jdbc/release-notes-for-the-jdbc-driver?view=sql-server-ver15#94
+# and copy mssql-jdbc_auth-9.4.1.x64.dll to your path.
 #sonar.jdbc.url=jdbc:sqlserver://localhost;databaseName=sonar;integratedSecurity=true
 
 # Use the following connection string if you want to use SQL Auth while connecting to MS Sql Server.