From 9bd0569994d732b329a44abc36226e054a469fb7 Mon Sep 17 00:00:00 2001
From: Alon Dolev <alon@dolev.ch>
Date: Tue, 23 Apr 2019 18:16:31 +0200
Subject: [PATCH] Resets Flyway version to non-beta

---
 README.md                                     |  9 ++--
 build.gradle                                  |  7 ++-
 .../ch/ayedo/jooqmodelator/IntegrationTest.kt | 50 -------------------
 3 files changed, 10 insertions(+), 56 deletions(-)

diff --git a/README.md b/README.md
index 24a35ee..8b7e8c8 100644
--- a/README.md
+++ b/README.md
@@ -31,17 +31,18 @@ The plugin has been tested with Version 18.06.1-ce-mac73 (26764).
 
 Two migration engines are supported:
 
-- Flyway (version '6.0.0-beta')
+- Flyway (version '5.2.4')
 - Liquibase (version '3.6.3')
 
-Flyway is fully supported.
+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. Because of a Flyway related problem, this means that Postgres 11 is currently unsupported when using Flyway. 
 
 __For Liquibase there are limitations:__
 
 - You cannot choose the name of your database change log. __It has to be named 'databaseChangeLog'__. The file ending does not matter, and can be any of the supported file types.
 - All migration files need be located within the configured migrations folders (see section 'Configuration'). This is required for incremental build support.
 
-All databases which you can run in a Docker container, and for which a JDBC driver can be provided, are supported. The plugin has been successfully tested with Postgres 11.2, and MariaDB 10.2.
+All databases which you can run in a Docker container, and for which a JDBC driver can be provided, are supported. The plugin has been successfully tested with Postgres 9.6, and MariaDB 10.2.
 
 Due to backwards incompatible changes in the API, __no jooq generator version older than 3.11.0 is currently supported__.
 
@@ -50,7 +51,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.1.0'
+          id 'ch.ayedo.jooqmodelator' version '3.2.0'
     }
 
 ## Configuration
diff --git a/build.gradle b/build.gradle
index 1ee2477..0ed70f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 apply plugin: 'java-gradle-plugin'
 
-project.ext.version = '3.1.0'
+project.ext.version = '3.2.0'
 
 group 'ch.ayedo'
 version project.ext.version
@@ -25,12 +25,15 @@ dependencies {
     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:6.0.0-beta')
+    compile('org.flywaydb:flyway-core:5.2.4')
     compile('org.liquibase:liquibase-core:3.6.3') {
         exclude group: 'ch.qos.logback', module: 'logback-classic'
     }
     compile('org.slf4j:slf4j-simple:1.7.25')
 
+    compile('com.sun.xml.bind:jaxb-impl:2.2.11')
+    compile('com.sun.xml.bind:jaxb-core:2.2.11')
+
     testCompile('org.junit.jupiter:junit-jupiter-api:5.2.0')
     testRuntime('org.junit.jupiter:junit-jupiter-engine:5.2.0')
 }
diff --git a/src/test/kotlin/ch/ayedo/jooqmodelator/IntegrationTest.kt b/src/test/kotlin/ch/ayedo/jooqmodelator/IntegrationTest.kt
index 17fe66a..04affdd 100644
--- a/src/test/kotlin/ch/ayedo/jooqmodelator/IntegrationTest.kt
+++ b/src/test/kotlin/ch/ayedo/jooqmodelator/IntegrationTest.kt
@@ -57,56 +57,6 @@ class IntegrationTest {
 
     }
 
-    @Test
-    fun flywayPostgres11() {
-
-        val jooqConfig = createJooqConfig(POSTGRES)
-
-        val config = Configuration(
-            dockerConfig = DockerConfig(
-                tag = "postgres:11",
-                env = listOf("POSTGRES_DB=postgres", "POSTGRES_USER=postgres", "POSTGRES_PASSWORD=secret"),
-                portMapping = PortMapping(5432, 5432)),
-            healthCheckConfig = HealthCheckConfig(),
-            migrationConfig = MigrationConfig(engine = MigrationEngine.FLYWAY, migrationsPaths = getMigrationPaths("/migrations", "/migrationsB")),
-            jooqConfigPath = jooqConfig.toPath()
-        )
-
-        createBuildFile(config)
-
-        assertBuildOutcome(SUCCESS)
-
-        assertFileExists("${tempDir.root.absolutePath}$jooqPackagePath/tables/Tab.java")
-
-        assertFileExists("${tempDir.root.absolutePath}$jooqPackagePath/tables/TabTwo.java")
-
-    }
-
-    @Test
-    fun flywayKartozaPostgis() {
-
-        val jooqConfig = createJooqConfig(POSTGRES, user = "docker", password = "docker", databaseName = "gis", port = 25432)
-
-        val config = Configuration(
-            dockerConfig = DockerConfig(
-                tag = "kartoza/postgis:10.0-2.4",
-                env = listOf("POSTGRES_DBNAME=gis", "POSTGRES_USER=docker", "POSTGRES_PASSWORD=docker"),
-                portMapping = PortMapping(25432, 5432)),
-            healthCheckConfig = HealthCheckConfig(),
-            migrationConfig = MigrationConfig(engine = MigrationEngine.FLYWAY, migrationsPaths = getMigrationPaths("/migrations", "/migrationsB")),
-            jooqConfigPath = jooqConfig.toPath()
-        )
-
-        createBuildFile(config)
-
-        assertBuildOutcome(SUCCESS)
-
-        assertFileExists("${tempDir.root.absolutePath}$jooqPackagePath/tables/Tab.java")
-
-        assertFileExists("${tempDir.root.absolutePath}$jooqPackagePath/tables/TabTwo.java")
-
-    }
-
     @Test
     fun liquibasePostgres() {