SONAR-11617 Support SQLServer 2017

[skip ci]

diff --git a/server/sonar-docs/src/pages/requirements/requirements.md b/server/sonar-docs/src/pages/requirements/requirements.md
index 6ed1564b1151df08c146fce95d4ef2b5aa0af83c..f89a7e80f4697f344dffebb5e08b14bc412ecd3c 100644 (file)
--- a/server/sonar-docs/src/pages/requirements/requirements.md
+++ b/server/sonar-docs/src/pages/requirements/requirements.md
@@ -47,6 +47,7 @@ We recommend using the Critical Path Update (CPU) releases.
 | [Microsoft SQL Server](http://www.microsoft.com/sqlserver/) | ![](/images/cross.svg) 2012 (MSSQL Server 11.0)                                                                                                                                                                                                                   |
 |                                                             | ![](/images/check.svg) 2014 (MSSQL Server 12.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) 2017 (MSSQL Server 14.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)                                                                                                                                      |
 |                                                             | ![](/images/exclamation.svg) READ_COMMITTED_SNAPSHOT must be set on the SonarQube database to avoid potential deadlocks under heavy load                                                                                                                          |
 |                                                             | ![](/images/info.svg) Both Windows authentication (“Integrated Security”) and SQL Server authentication are supported. See the Microsoft SQL Server section in Installing/installation/installing-the-server page for instructions on configuring authentication. |

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 92eea9c6d1f9020cd480c43b64c57de4e4bad849..984274da44ef7ac728f41380db7095fde23cc066 100644 (file)
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -41,7 +41,7 @@
 #sonar.jdbc.url=jdbc:postgresql://localhost/sonarqube?currentSchema=my_schema
 
 
-#----- Microsoft SQLServer 2014/2016 and SQL Azure
+#----- Microsoft SQLServer 2014/2016/2017 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