diff options
| -rw-r--r-- | build.gradle | 10 | ||||
| -rw-r--r-- | server/sonar-docs/src/pages/setup/install-server.md | 2 | ||||
| -rw-r--r-- | server/sonar-docs/src/pages/setup/sonar-properties.md | 2 | ||||
| -rw-r--r-- | sonar-application/src/main/assembly/conf/sonar.properties | 6 |
4 files changed, 11 insertions, 9 deletions
diff --git a/build.gradle b/build.gradle index 2348f675555..810c80180a4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,16 @@ import groovy.json.JsonOutput plugins { - // Ordered alphabeticly + // Ordered alphabetically id 'com.github.hierynomus.license' version '0.15.0' id "com.github.hierynomus.license-report" version "0.15.0" apply false id 'com.github.johnrengelman.shadow' version '5.2.0' apply false id 'com.google.protobuf' version '0.8.19' apply false id 'com.jfrog.artifactory' version '4.24.23' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' - id 'org.sonarqube' version '3.4.0.2513' id "de.undercouch.download" version "5.0.1" apply false + id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "org.cyclonedx.bom" version "1.6.1" apply false + id 'org.sonarqube' version '3.4.0.2513' } if (!JavaVersion.current().java11Compatible) { @@ -230,7 +230,9 @@ 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:10.2.1.jre11' + dependency('com.microsoft.sqlserver:mssql-jdbc:11.2.0.jre11') { + exclude 'com.fasterxml.jackson.core:jackson-databind' + } dependency 'com.oracle.database.jdbc:ojdbc8:21.6.0.0.1' dependency 'org.aspectj:aspectjtools:1.9.9.1' dependencySet(group: 'com.squareup.okhttp3', version: '4.10.0') { diff --git a/server/sonar-docs/src/pages/setup/install-server.md b/server/sonar-docs/src/pages/setup/install-server.md index 8e5ab3f158a..9c1337a2d15 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 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. +|1. Download the [Microsoft SQL JDBC Auth 11.2.0 package](https://github.com/microsoft/mssql-jdbc/releases/download/v11.2.0/mssql-jdbc_auth.zip) and copy `mssql-jdbc_auth-11.2.0.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 b1db46b7d96..addbb7b691e 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 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. +For Integrated Security to work, you have to download the Microsoft SQL JDBC Auth 11.2.0 package [here](https://github.com/microsoft/mssql-jdbc/releases/download/v11.2.0/mssql-jdbc_auth.zip) and copy `mssql-jdbc_auth-11.2.0.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 bb48278a717..e862e0632b7 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -40,9 +40,9 @@ # 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 Auth 10.2.1 package from -# https://github.com/microsoft/mssql-jdbc/releases/download/v10.2.1/mssql-jdbc_auth.zip -# and 'mssql-jdbc_auth-10.2.1.x64.dll' to your path. +# For Integrated Security to work, you have to download the Microsoft SQL JDBC Auth 11.2.0 package from +# https://github.com/microsoft/mssql-jdbc/releases/download/v11.2.0/mssql-jdbc_auth.zip +# and 'mssql-jdbc_auth-11.2.0.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. |