SONAR-14146 Support MS SQL 2019 database

diff --git a/.cirrus.yml b/.cirrus.yml
index dece363cb3ab5fb6e0c9428e4bb05f9b0bdd18fa..c3ebe2fd8a71f778b8f51637e8fc639ab1a7f43e 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -30,7 +30,7 @@ task_only_nightly_depending_on_build_template: &TASK_ONLY_NIGHTLY_DEPENDING_ON_B
   depends_on: build
   # Comment the following line and commit with message "DO NOT MERGE" in order to run
   # this task on your branch
-  only_if: $CIRRUS_BRANCH == "branch-nightly-build"
+  #only_if: $CIRRUS_BRANCH == "branch-nightly-build"
 
 task_only_default_depending_on_build_template: &TASK_ONLY_DEFAUT_DEPENDING_ON_BUILD_TEMPLATE
   depends_on: build
@@ -389,14 +389,14 @@ deploy_docs_task:
   script:
     - ./private/cirrus/cirrus-trigger-deploy-docs.sh
 
-sql_mssql2017_task:
+sql_mssql2019_task:
   <<: *TASK_ONLY_NIGHTLY_DEPENDING_ON_BUILD_TEMPLATE
   gke_container:
     <<: *GKE_CONTAINER_TEMPLATE
     memory: 5Gb
     additional_containers:
       - name: mssql
-        image: mcr.microsoft.com/mssql/server:2017-GA-ubuntu
+        image: mcr.microsoft.com/mssql/server:2019-GA-ubuntu-16.04
         port: 1433
         cpu: 2
         memory: 5Gb
@@ -435,7 +435,7 @@ sql_oracle12_task:
   on_failure:
     <<: *REPORTS_JUNIT_ON_FAILURE_TEMPLATE
 
-upgd_mssql2017_task:
+upgd_mssql2019_task:
   <<: *TASK_ONLY_NIGHTLY_DEPENDING_ON_BUILD_TEMPLATE
   gke_container:
     <<: *GKE_CONTAINER_TEMPLATE
@@ -443,7 +443,7 @@ upgd_mssql2017_task:
     memory: 6Gb
     additional_containers:
       - name: mssql
-        image: mcr.microsoft.com/mssql/server:2017-GA-ubuntu
+        image: mcr.microsoft.com/mssql/server:2019-GA-ubuntu-16.04
         port: 1433
         cpu: 2
         memory: 5Gb

diff --git a/build.gradle b/build.gradle
index 4c1a4b79624435b0c9aa24a221ddf3a058ecb233..0d26ee465f703237461477f9b7fa572309bbc2e0 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -275,7 +275,7 @@ subprojects {
         entry 'hazelcast-client'
       }
       dependency 'com.ibm.icu:icu4j:3.4.4'
-      dependency 'com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre11'
+      dependency 'com.microsoft.sqlserver:mssql-jdbc:9.2.0.jre11'
       dependency 'com.oracle.database.jdbc:ojdbc8:19.3.0.0'
       // upgrade okhttp3 dependency kotlin to get rid of not exploitable CVE-2020-29582
       dependency 'org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21'

diff --git a/server/sonar-docs/src/pages/requirements/requirements.md b/server/sonar-docs/src/pages/requirements/requirements.md
index 4f87f7c14dd53b41969f4ce0f465f8cc1ee30176..3e81a1007e18755371dc631939b9edb5968b3311 100644 (file)
--- a/server/sonar-docs/src/pages/requirements/requirements.md
+++ b/server/sonar-docs/src/pages/requirements/requirements.md
@@ -40,7 +40,8 @@ We recommend using the Critical Patch Update (CPU) releases.
 |                                                             | ![](/images/check.svg) 10                                                                                                                                                                                                                                         |
 |                                                             | ![](/images/check.svg) 9.3–9.6                                                                                                                                                                                                                                    |
 |                                                             | ![](/images/exclamation.svg) Must be configured to use UTF-8 charset                                                                                                                                                                                              |
-| [Microsoft SQL Server](http://www.microsoft.com/sqlserver/) | ![](/images/check.svg) 2017 (MSSQL Server 14.0) with bundled Microsoft JDBC driver. Express Edition is supported.                                                                                                                                                 |
+| [Microsoft SQL Server](http://www.microsoft.com/sqlserver/) | ![](/images/check.svg) 2019 (MSSQL Server 15.0) with bundled Microsoft JDBC driver. Express Edition is supported.                                                                                                                                                 |
+|                                                             | ![](/images/check.svg) 2017 (MSSQL Server 14.0) with bundled Microsoft JDBC driver. Express Edition is supported.                                                                                                                                                 |
 |                                                             | ![](/images/check.svg) 2016 (MSSQL Server 13.0) with bundled Microsoft JDBC driver. Express Edition is supported.                                                                                                                                                 |
 |                                                             | ![](/images/check.svg) 2014 (MSSQL Server 12.0) with bundled Microsoft JDBC driver. Express Edition is supported.                                                                                                                                                 |
 |                                                             | ![](/images/exclamation.svg) Collation must be case-sensitive (CS) and accent-sensitive (AS) (example: `Latin1_General_CS_AS`)                                                                                                                                      |