Merge pull request #11 from ursjoss/chore/version_updates

Chore/version updates

README.md

@@ -31,11 +31,8 @@ The plugin has been tested with Version 18.06.1-ce-mac73 (26764).
 
 Two migration engines are supported:
 
-- Flyway (version '5.2.4')
-- Liquibase (version '3.6.3')
-
-Flyway is fully supported. Please note that version 3.1.0 of the plugin used the Flyway version '6.0.0-beta'. This was a mistake, and has been
-reset to Flyway 5.2.4 in version 3.2.0, and later versions. Because of a Flyway related problem, this means that Postgres 11 is currently unsupported when using Flyway. 
+- Flyway (version '6.0.1')
+- Liquibase (version '3.8.0')
 
 __For Liquibase there are limitations:__
 
@@ -51,7 +48,7 @@ Due to backwards incompatible changes in the API, __no jooq generator version ol
 Add the following to your *build.gradle* plugin configuration block:
 
     plugins {
-          id 'ch.ayedo.jooqmodelator' version '3.5.0'
+          id 'ch.ayedo.jooqmodelator' version '3.6.0'
     }
 
 ## Configuration
@@ -75,7 +72,7 @@ Add the following to your build script:
         // The version of the jooq-generator that should be used
         // The dependency is added, and loaded dynamically.
         // Only versions 3.11.0 and later are supported.
-        jooqVersion = '3.11.4' // required, this is an example
+        jooqVersion = '3.12.0' // required, this is an example
         
         // Which edition of the jooq-generator to be used.
         // Possible values are: "OSS", "PRO", "PRO_JAVA_6", or "TRIAL".
@@ -101,7 +98,7 @@ Add the following to your build script:
         // DOCKER RELATED CONFIGURATION
         
         // The tag of the image that will be pulled, and used to create the db container
-        dockerTag = 'postgres:9.5' // required, this is an example
+        dockerTag = 'postgres:11.5' // required, this is an example
 
         // The environment variables to be passed to the docker container
         dockerEnv = ['POSTGRES_DB=postgres', 'POSTGRES_USER=postgres', 'POSTGRES_PASSWORD=secret'] // required, this is an example
@@ -134,7 +131,7 @@ You add your database drivers as follows:
 
     dependencies {
         // Add your JDBC drivers, and generator extensions here
-        jooqModelatorRuntime('org.postgresql:postgresql:42.2.4')
+        jooqModelatorRuntime('org.postgresql:postgresql:42.2.6')
     }
 
 ### Configuration Changes

build.gradle

@@ -1,11 +1,11 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.3.30'
-    id 'com.gradle.plugin-publish' version '0.10.0'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.50'
+    id 'com.gradle.plugin-publish' version '0.10.1'
 }
 
 apply plugin: 'java-gradle-plugin'
 
-project.ext.version = '3.5.0'
+project.ext.version = '3.6.0'
 
 group 'ch.ayedo'
 version project.ext.version
@@ -23,21 +23,21 @@ dependencies {
     compile gradleApi()
 
     compile('org.jetbrains.kotlin:kotlin-stdlib-jdk8')
-    compile('net.jodah:failsafe:1.1.0')
-    compile('com.spotify:docker-client:8.15.2')
-    compile('org.flywaydb:flyway-core:5.2.4')
-    compile('org.liquibase:liquibase-core:3.6.3') {
+    compile('net.jodah:failsafe:1.1.1')
+    compile('com.spotify:docker-client:8.16.0')
+    compile('org.flywaydb:flyway-core:6.0.1')
+    compile('org.liquibase:liquibase-core:3.8.0') {
         exclude group: 'ch.qos.logback', module: 'logback-classic'
     }
-    compile('org.slf4j:slf4j-simple:1.7.25')
+    compile('org.slf4j:slf4j-simple:1.7.28')
 
-    compile('javax.xml.bind:jaxb-api:2.3.0')
-    compile('com.sun.xml.bind:jaxb-core:2.3.0')
+    compile('javax.xml.bind:jaxb-api:2.3.1')
+    compile('com.sun.xml.bind:jaxb-core:2.3.0.1')
     compile('javax.activation:activation:1.1.1')
-    compile('com.sun.xml.bind:jaxb-impl:2.3.0')
+    compile('com.sun.xml.bind:jaxb-impl:2.3.2')
 
-    testCompile('org.junit.jupiter:junit-jupiter-api:5.2.0')
-    testRuntime('org.junit.jupiter:junit-jupiter-engine:5.2.0')
+    testCompile('org.junit.jupiter:junit-jupiter-api:5.5.1')
+    testRuntime('org.junit.jupiter:junit-jupiter-engine:5.5.1')
 }
 
 pluginBundle {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Aug 22 16:27:11 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

gradlew

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

gradlew.bat

@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega