Author: reschke
Date: Wed Apr 25 07:52:57 2018
New Revision: 1830049
URL: http://svn.apache.org/viewvc?rev=1830049&view=rev
Log:
OAK-7446: RDB*Store: update SQLServer JDBC dependency to 6.4.0.jre* (ported to
1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-parent/pom.xml
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 25 07:52:57 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957,1827472,1827486,1827977
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1830019
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-parent/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-parent/pom.xml?rev=1830049&r1=1830048&r2=1830049&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-parent/pom.xml Wed Apr 25 07:52:57 2018
@@ -914,17 +914,12 @@
</dependencies>
</profile>
<profile>
- <!-- requires local copy of MS SqlServer JDBC driver deployed to Maven
repo-->
- <!-- for instance:
- mvn install:install-file -Dfile=sqljdbc41.jar -Dpackaging=jar\
- -DgroupId=com.microsoft.sqlserver -DartifactId=sqljdbc4 -Dversion=4.1
- -->
<id>rdb-mssql</id>
<dependencies>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
- <artifactId>sqljdbc4</artifactId>
- <version>4.1</version>
+ <artifactId>mssql-jdbc</artifactId>
+ <version>6.4.0.jre8</version>
</dependency>
</dependencies>
</profile>