#4816 SQL Server: driver version update (7.1.4)

dbeaver · Jan 12, 2019 · daf6897 · daf6897
1 parent 65552b9
commit daf6897
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 #################
-## Eclipse, IDEA and Maven
-#################
+## Misc
 
 bin/
 tmp/
@@ -15,6 +14,8 @@ local.properties
 # External tool builders
 .externalToolBuilders/
 
+## Maven stuff
+
 target/
 pom.xml.tag
 pom.xml.releaseBackup
@@ -26,10 +27,18 @@ buildNumber.properties
 .mvn/timing.properties
 /workspace/
 
+## IDEA configs
+
 *.iml
 /idea/
 .idea/
 
+## Eclipse configs
+
+.project
+.classpath
+.settings/
+
 #############
 ## Windows detritus
 #############

diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/plugin.xml b/plugins/org.jkiss.dbeaver.ext.mssql/plugin.xml
@@ -144,11 +144,13 @@
 
                     <replace provider="mssql" driver="mssql_jdbc_ms_new"/>
 
-                    <file type="jar" path="maven:/com.microsoft.sqlserver:mssql-jdbc:RELEASE[7.0.0.jre8]" bundle="!drivers.mssql.new"/>
+                    <file type="jar" path="maven:/com.microsoft.sqlserver:mssql-jdbc:RELEASE[7.1.4.jre8-preview]" bundle="!drivers.mssql.new"/>
+                    <!--<file type="jar" path="maven:/com.microsoft.azure:adal4j:RELEASE" optional="true" />-->
                     <file type="lib" os="win32" arch="x86" path="repo:/drivers/mssql/auth/x86/sqljdbc_auth.dll" bundle="!drivers.mssql.new"/>
                     <file type="lib" os="win32" arch="x86_64" path="repo:/drivers/mssql/auth/x64/sqljdbc_auth.dll" bundle="!drivers.mssql.new"/>
 
                     <file type="jar" path="drivers/mssql/new/mssql-jdbc.jar" bundle="drivers.mssql.new"/>
+                    <!--<file type="jar" path="drivers/mssql/new/adal4j.jar" optional="true" />-->
                     <file type="lib" os="win32" arch="x86" path="drivers/mssql/new/auth/x86/sqljdbc_auth.dll" bundle="drivers.mssql.new"/>
                     <file type="lib" os="win32" arch="x86_64" path="drivers/mssql/new/auth/x64/sqljdbc_auth.dll" bundle="drivers.mssql.new"/>
                     <file type="license" path="drivers/mssql/new/LICENSE.txt" bundle="drivers.mssql.new"/>
@@ -168,7 +170,7 @@
 
                     <replace provider="mssql" driver="mssql_jdbc_azure"/>
 
-                    <file type="jar" path="maven:/com.microsoft.sqlserver:mssql-jdbc:RELEASE[7.0.0.jre8]" bundle="!drivers.mssql.new"/>
+                    <file type="jar" path="maven:/com.microsoft.sqlserver:mssql-jdbc:RELEASE[7.1.4.jre8-preview]" bundle="!drivers.mssql.new"/>
                     <file type="jar" path="drivers/mssql/new/mssql-jdbc.jar" bundle="drivers.mssql.new"/>
 
                     <!-- Active directory auth -->