Merge remote-tracking branch 'origin/4.1.x' into LB-209

.gitignore

@@ -11,7 +11,7 @@ release.properties
 /.idea/workspace.xml
 /out
 /bin
-liquibase.integrationtest.local.properties
+**/liquibase.integrationtest.local.properties
 derby.log
 .idea
 *.iml
@@ -28,3 +28,5 @@ _issues
 jacoco.exec
 **/original-pom.xml
 original-pom.xml
+**/logback-test.xml
+**/*.swp

.travis/databases.docker-compose.yml

@@ -18,10 +18,22 @@ services:
     image: postgres:9
     ports:
       - "5432:5432"
-    environment:
     restart: always
     environment:
       POSTGRES_PASSWORD: LbRootPass1
       POSTGRES_DB: lbcat
     volumes:
       - "./postgres-init.sh:/docker-entrypoint-initdb.d/postgres-init.sh"
+
+  mssql:
+    image: mcr.microsoft.com/mssql/server:2017-latest
+    ports:
+      - "1433:1433"
+    restart: always
+    environment:
+      ACCEPT_EULA: Y
+      SA_PASSWORD: LiquibasePass1
+    volumes:
+      - "./mssql-init.sh:/docker-entrypoint-initdb.d/mssql-init.sh"
+      - "./mssql-init.sql:/docker-entrypoint-initdb.d/mssql-init.sql"
+    entrypoint: /bin/bash /docker-entrypoint-initdb.d/mssql-init.sh

.travis/mssql-init.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+/opt/mssql/bin/sqlservr &
+
+echo "Waiting for server to start...."
+#do this in a loop because the timing for when the SQL instance is ready is indeterminate
+for i in {1..50};
+do
+    /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P ${SA_PASSWORD} -d master -i /docker-entrypoint-initdb.d/mssql-init.sql
+    if [ $? -eq 0 ]
+    then
+        echo "mssql-init.sh completed"
+        break
+    else
+        echo "not ready yet..."
+        sleep 5
+    fi
+done
+
+sleep infinity

.travis/mssql-init.sql

@@ -0,0 +1,41 @@
+DECLARE @dataPath varchar(256);
+DECLARE @logPath varchar(256);
+SET @dataPath=(SELECT CAST(serverproperty('InstanceDefaultDataPath') AS varchar(256)));
+SET @logPath=(SELECT CAST(serverproperty('InstanceDefaultLogPath') AS varchar(256)));
+
+CREATE LOGIN [lbuser] with password=N'LiquibasePass1', CHECK_EXPIRATION=OFF;
+GO
+
+CREATE DATABASE lbcat;
+GO
+
+EXEC lbcat..sp_addsrvrolemember @loginame = N'lbuser', @rolename = N'sysadmin'
+GO
+
+/* By default, we set the compatibility level to the oldest version we are officially supporting. Note that there
+ * are differences in behaviour, e.g. with implicit conversions of date and time values. See
+ * https://docs.microsoft.com/en-us/sql/t-sql/functions/cast-and-convert-transact-sql for details.
+ */
+ALTER DATABASE [lbcat] SET COMPATIBILITY_LEVEL = 100
+GO
+
+USE [lbcat]
+GO
+ALTER DATABASE [lbcat] MODIFY FILEGROUP [PRIMARY] DEFAULT
+GO
+ALTER DATABASE [lbcat] ADD FILEGROUP [liquibase2]
+GO
+
+DECLARE @dataPath varchar(256);
+DECLARE @logPath varchar(256);
+SET @dataPath=(SELECT CAST(serverproperty('InstanceDefaultDataPath') AS varchar(256)));
+SET @logPath=(SELECT CAST(serverproperty('InstanceDefaultLogPath') AS varchar(256)));
+
+DECLARE @createSql varchar(2000);
+SET @createSql = (SELECT 'ALTER DATABASE [lbcat] ADD FILE ( NAME = N''liquibase2'', FILENAME = N''' + @dataPath + 'liquibase2.ndf'' , SIZE = 8192KB , FILEGROWTH = 65536KB ) TO FILEGROUP [liquibase2]');
+EXECUTE(@createSql);
+GO
+
+
+CREATE SCHEMA [lbcat2] AUTHORIZATION [dbo]
+GO

base.pom.xml

@@ -50,7 +50,7 @@
     </scm>
 
     <properties>
-        <liquibase.base.version>4.0.0-beta2</liquibase.base.version>
+        <liquibase.base.version>4.1.1</liquibase.base.version>
         <liquibase.version.qualifier>-local</liquibase.version.qualifier>
         <liquibase.version.snapshot>-SNAPSHOT</liquibase.version.snapshot>
         <liquibase.version>${liquibase.base.version}${liquibase.version.qualifier}${liquibase.version.snapshot}</liquibase.version>
@@ -99,6 +99,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.3.3</version>
+            <scope>test</scope>
+        </dependency>
+
 
         <dependency> <!-- use a specific Groovy version rather than the one specified by spock-core -->
             <groupId>org.codehaus.groovy</groupId>
@@ -137,7 +144,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.197</version>
+            <version>1.4.200</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -154,7 +161,14 @@
             <scope>test</scope>
     	</dependency>
 
-	<dependency>
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>8.2.2.jre8</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
     	    <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>42.2.12</version>