aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuarte Meneses <duarte.meneses@sonarsource.com>2022-06-13 15:52:25 -0500
committersonartech <sonartech@sonarsource.com>2022-06-15 20:03:03 +0000
commitbe5e88bd69d3266b5791b883374971b4f2c03780 (patch)
tree910bb8cc2363fdce7ab89eae885a436c728cf805
parent2a7127370736396d0f912d58ff5d6df5ed30bd07 (diff)
downloadsonarqube-be5e88bd69d3266b5791b883374971b4f2c03780.tar.gz
sonarqube-be5e88bd69d3266b5791b883374971b4f2c03780.zip
SONAR-16249 Update mssql JDBC to v10.2.1
-rw-r--r--build.gradle2
-rw-r--r--server/sonar-docs/src/pages/setup/install-server.md2
-rw-r--r--server/sonar-docs/src/pages/setup/sonar-properties.md2
-rw-r--r--sonar-application/src/main/assembly/conf/sonar.properties7
4 files changed, 7 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle
index 83124244704..96f2f87ff4d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -229,7 +229,7 @@ subprojects {
}
dependency 'com.hazelcast:hazelcast-kubernetes:2.2.3'
// Documentation must be updated if mssql-jdbc is updated: https://github.com/SonarSource/sonarqube/commit/03e4773ebf6cba854cdcf57a600095f65f4f53e7
- dependency 'com.microsoft.sqlserver:mssql-jdbc:9.4.1.jre11'
+ dependency 'com.microsoft.sqlserver:mssql-jdbc:10.2.1.jre11'
dependency 'com.oracle.database.jdbc:ojdbc8:21.5.0.0'
dependency 'org.aspectj:aspectjtools:1.9.9.1'
// upgrade okhttp3 dependency kotlin to get rid of not exploitable CVE-2020-29582
diff --git a/server/sonar-docs/src/pages/setup/install-server.md b/server/sonar-docs/src/pages/setup/install-server.md
index df3c32949e2..91b6776e528 100644
--- 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.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.
+|1. Download the [Microsoft SQL JDBC Auth 10.2.1 package](https://github.com/microsoft/mssql-jdbc/releases/download/v10.2.1/mssql-jdbc_auth.zip) and copy `mssql-jdbc_auth-10.2.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 d822316c39e..b1db46b7d96 100644
--- 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.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.
+For Integrated Security to work, you have to download the Microsoft SQL JDBC Auth 10.2.1 package [here](https://github.com/microsoft/mssql-jdbc/releases/download/v10.2.1/mssql-jdbc_auth.zip) and copy `mssql-jdbc_auth-10.2.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 8174c4d1029..a5a8bb5dadc 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -40,9 +40,10 @@
# 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
-# For Integrated Security to work, you have to download the Microsoft SQL JDBC Driver 9.4.1 package from
-# 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.
+# For Integrated Security to work, you have to download the Microsoft SQL JDBC Auth 10.2.1 package from
+# https://github.com/microsoft/mssql-jdbc/releases/download/v10.2.1/mssql-jdbc_auth.zip
+# and copy one of the dll files to your path. You have to copy the 32 bit or 64 bit version of the dll
+# depending upon the architecture of your server machine.
#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.