From b19d48fc9e2ab43ff701499974f9552f1a7e64e1 Mon Sep 17 00:00:00 2001 From: Adrian Skrobacz Date: Tue, 13 Apr 2021 15:45:44 +0200 Subject: [PATCH] Upgrade jOOQ version to 3.14.8 along with minor dependency upgrades --- README.md | 10 +++++----- build.gradle.kts | 12 ++++++------ .../com/revolut/jooq/FlywaySchemaVersionProvider.kt | 2 +- src/test/groovy/JooqDockerPluginSpec.groovy | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index a82c377..58058b0 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ repositories { } dependencies { - implementation("org.jooq:jooq:3.13.1") + implementation("org.jooq:jooq:3.14.8") jdbc("org.postgresql:postgresql:42.2.5") } ``` @@ -64,7 +64,7 @@ tasks { } dependencies { - implementation("org.jooq:jooq:3.13.1") + implementation("org.jooq:jooq:3.14.8") jdbc("org.postgresql:postgresql:42.2.5") } ``` @@ -108,7 +108,7 @@ jooq { } dependencies { - implementation("org.jooq:jooq:3.13.1") + implementation("org.jooq:jooq:3.14.8") jdbc("mysql:mysql-connector-java:8.0.15") } ``` @@ -137,7 +137,7 @@ tasks { } dependencies { - implementation("org.jooq:jooq:3.13.1") + implementation("org.jooq:jooq:3.14.8") jdbc("org.postgresql:postgresql:42.2.5") } ``` @@ -162,7 +162,7 @@ tasks { } dependencies { - implementation("org.jooq:jooq:3.13.1") + implementation("org.jooq:jooq:3.14.8") jdbc("org.postgresql:postgresql:42.2.5") } ``` diff --git a/build.gradle.kts b/build.gradle.kts index d1c71c9..00e242a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,9 +10,9 @@ plugins { jacoco `maven-publish` id("java-gradle-plugin") - id("com.gradle.plugin-publish") version "0.12.0" - id("pl.droidsonroids.jacoco.testkit") version "1.0.7" - id("com.github.ben-manes.versions").version("0.28.0") + id("com.gradle.plugin-publish") version "0.14.0" + id("pl.droidsonroids.jacoco.testkit") version "1.0.8" + id("com.github.ben-manes.versions").version("0.38.0") } repositories { @@ -111,11 +111,11 @@ afterEvaluate { dependencies { - implementation("org.jooq:jooq-codegen:3.13.2") + implementation("org.jooq:jooq-codegen:3.14.8") implementation("org.glassfish.jaxb:jaxb-runtime:2.3.3") - implementation("com.github.docker-java:docker-java-transport-okhttp:3.2.1") + implementation("com.github.docker-java:docker-java-transport-okhttp:3.2.8") implementation("org.flywaydb:flyway-core:6.4.3") - implementation("org.zeroturnaround:zt-exec:1.11") + implementation("org.zeroturnaround:zt-exec:1.12") compileOnly("javax.annotation:javax.annotation-api:1.3.2") testImplementation("org.spockframework:spock-core:1.3-groovy-2.5") diff --git a/src/main/kotlin/com/revolut/jooq/FlywaySchemaVersionProvider.kt b/src/main/kotlin/com/revolut/jooq/FlywaySchemaVersionProvider.kt index c70b564..b24cf50 100644 --- a/src/main/kotlin/com/revolut/jooq/FlywaySchemaVersionProvider.kt +++ b/src/main/kotlin/com/revolut/jooq/FlywaySchemaVersionProvider.kt @@ -15,7 +15,7 @@ class FlywaySchemaVersionProvider : SchemaVersionProvider { } } - override fun version(schema: SchemaDefinition): String { + override fun version(schema: SchemaDefinition): String? { return schema.database.create() .select(max(field("version")).`as`("max_version")) .from(table(name(defaultSchemaName.get(), flywayTableName.get()))) diff --git a/src/test/groovy/JooqDockerPluginSpec.groovy b/src/test/groovy/JooqDockerPluginSpec.groovy index 9774851..c5a4199 100644 --- a/src/test/groovy/JooqDockerPluginSpec.groovy +++ b/src/test/groovy/JooqDockerPluginSpec.groovy @@ -845,7 +845,7 @@ class JooqDockerPluginSpec extends Specification { dependencies { jdbc("org.postgresql:postgresql:42.2.5") - implementation("org.jooq:jooq:3.13.1") + implementation("org.jooq:jooq:3.14.8") implementation("javax.annotation:javax.annotation-api:1.3.2") } """) @@ -894,7 +894,7 @@ class JooqDockerPluginSpec extends Specification { dependencies { implementation(kotlin("stdlib")) jdbc("org.postgresql:postgresql:42.2.5") - implementation("org.jooq:jooq:3.13.1") + implementation("org.jooq:jooq:3.14.8") implementation("javax.annotation:javax.annotation-api:1.3.2") } """) @@ -938,7 +938,7 @@ class JooqDockerPluginSpec extends Specification { dependencies { jdbc("org.postgresql:postgresql:42.2.5") - "implementation"("org.jooq:jooq:3.13.1") + "implementation"("org.jooq:jooq:3.14.8") "implementation"("javax.annotation:javax.annotation-api:1.3.2") } """) @@ -986,7 +986,7 @@ class JooqDockerPluginSpec extends Specification { dependencies { jdbc("org.postgresql:postgresql:42.2.5") - "implementation"("org.jooq:jooq:3.13.1") + "implementation"("org.jooq:jooq:3.14.8") "implementation"("javax.annotation:javax.annotation-api:1.3.2") } """) @@ -1041,7 +1041,7 @@ class JooqDockerPluginSpec extends Specification { dependencies { "implementation"(kotlin("stdlib")) jdbc("org.postgresql:postgresql:42.2.5") - "implementation"("org.jooq:jooq:3.13.1") + "implementation"("org.jooq:jooq:3.14.8") "implementation"("javax.annotation:javax.annotation-api:1.3.2") } """)