From f4882581e1f4dd4bf35fbd0e8eec1650baacdcc9 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 23 Jun 2022 14:56:33 +0200 Subject: [PATCH] Release 3.18.0-SNAPSHOT --- jOOQ-checker/pom.xml | 2 +- jOOQ-codegen-maven/pom.xml | 2 +- jOOQ-codegen/pom.xml | 2 +- .../src/main/java/org/jooq/codegen/Constants.java | 11 ++++++++--- jOOQ-examples/jOOQ-academy/pom.xml | 2 +- .../jOOQ-checker-framework-example/pom.xml | 2 +- jOOQ-examples/jOOQ-flyway-ddl-example/pom.xml | 2 +- jOOQ-examples/jOOQ-flyway-example/pom.xml | 2 +- jOOQ-examples/jOOQ-javafx-example/pom.xml | 2 +- jOOQ-examples/jOOQ-jpa-example-entities/pom.xml | 2 +- jOOQ-examples/jOOQ-jpa-example/pom.xml | 2 +- jOOQ-examples/jOOQ-kotlin-example/pom.xml | 2 +- jOOQ-examples/jOOQ-oracle-example/pom.xml | 2 +- jOOQ-examples/jOOQ-r2dbc-example/pom.xml | 2 +- jOOQ-examples/jOOQ-spark-chart-example/pom.xml | 2 +- jOOQ-examples/jOOQ-spark-example/pom.xml | 2 +- jOOQ-examples/jOOQ-spring-boot-example/pom.xml | 2 +- .../java/org/jooq/example/spring/Application.java | 4 ++-- jOOQ-examples/jOOQ-testcontainers-example/pom.xml | 2 +- .../jOOQ-testcontainers-flyway-example/pom.xml | 2 +- jOOQ-examples/pom.xml | 2 +- jOOQ-jackson-extensions/pom.xml | 2 +- jOOQ-kotlin-coroutines/pom.xml | 2 +- jOOQ-kotlin/pom.xml | 2 +- jOOQ-meta-extensions-hibernate/pom.xml | 2 +- jOOQ-meta-extensions-liquibase/pom.xml | 2 +- jOOQ-meta-extensions/pom.xml | 2 +- jOOQ-meta/pom.xml | 2 +- .../src/main/java/org/jooq/meta/Constants.java | 11 ++++++++--- jOOQ-migrations/pom.xml | 2 +- jOOQ-postgres-extensions/pom.xml | 2 +- jOOQ-scala_2.13/pom.xml | 2 +- jOOQ-xtend/pom.xml | 2 +- jOOQ/pom.xml | 13 ++++++++++++- jOOQ/src/main/java/org/jooq/Constants.java | 11 ++++++++--- 35 files changed, 68 insertions(+), 42 deletions(-) diff --git a/jOOQ-checker/pom.xml b/jOOQ-checker/pom.xml index 3e67e35743..4fc8d97368 100644 --- a/jOOQ-checker/pom.xml +++ b/jOOQ-checker/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-checker diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml index 95cad05ccc..264e3417c6 100644 --- a/jOOQ-codegen-maven/pom.xml +++ b/jOOQ-codegen-maven/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-codegen-maven diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml index e714012104..65210ba617 100644 --- a/jOOQ-codegen/pom.xml +++ b/jOOQ-codegen/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-codegen diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java index 9f06df77f2..7d239a8179 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java @@ -53,7 +53,7 @@ public final class Constants { /** * The latest jOOQ minor version. */ - public static final String MINOR_VERSION = "3.17"; + public static final String MINOR_VERSION = "3.18"; /** * The latest jOOQ version. @@ -61,7 +61,7 @@ public final class Constants { * This is the same as {@link #MINOR_VERSION}, but it may include patch * version suffixes. */ - public static final String VERSION = "3.17.1-SNAPSHOT"; + public static final String VERSION = "3.18.0-SNAPSHOT"; /** * The latest jOOQ full version. @@ -69,7 +69,7 @@ public final class Constants { * This is the same as {@link #VERSION}, but it may include release * candidate and other suffixes. */ - public static final String FULL_VERSION = "3.17.1-SNAPSHOT"; + public static final String FULL_VERSION = "3.18.0-SNAPSHOT"; /** * The current jooq-runtime XSD file name. @@ -170,6 +170,11 @@ public final class Constants { */ public static final String VERSION_3_17 = "3.17"; + /** + * The minor release 3.18. + */ + public static final String VERSION_3_18 = "3.18"; + /** * No further instances */ diff --git a/jOOQ-examples/jOOQ-academy/pom.xml b/jOOQ-examples/jOOQ-academy/pom.xml index 7cd06ebe09..31413f967e 100644 --- a/jOOQ-examples/jOOQ-academy/pom.xml +++ b/jOOQ-examples/jOOQ-academy/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-academy diff --git a/jOOQ-examples/jOOQ-checker-framework-example/pom.xml b/jOOQ-examples/jOOQ-checker-framework-example/pom.xml index f2ebac34dd..2b33c5db88 100644 --- a/jOOQ-examples/jOOQ-checker-framework-example/pom.xml +++ b/jOOQ-examples/jOOQ-checker-framework-example/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-checker-framework-example diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/pom.xml b/jOOQ-examples/jOOQ-flyway-ddl-example/pom.xml index eacf40f12f..28f687c9a5 100644 --- a/jOOQ-examples/jOOQ-flyway-ddl-example/pom.xml +++ b/jOOQ-examples/jOOQ-flyway-ddl-example/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-flyway-ddl-example diff --git a/jOOQ-examples/jOOQ-flyway-example/pom.xml b/jOOQ-examples/jOOQ-flyway-example/pom.xml index 9473ea3033..5dbd088a33 100644 --- a/jOOQ-examples/jOOQ-flyway-example/pom.xml +++ b/jOOQ-examples/jOOQ-flyway-example/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-flyway-example diff --git a/jOOQ-examples/jOOQ-javafx-example/pom.xml b/jOOQ-examples/jOOQ-javafx-example/pom.xml index 76c7abcb8b..94b2a59ede 100644 --- a/jOOQ-examples/jOOQ-javafx-example/pom.xml +++ b/jOOQ-examples/jOOQ-javafx-example/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-javafx-example diff --git a/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml b/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml index 9246b6eb88..0d81ae3606 100644 --- a/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml +++ b/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-jpa-example-entities diff --git a/jOOQ-examples/jOOQ-jpa-example/pom.xml b/jOOQ-examples/jOOQ-jpa-example/pom.xml index 5dabcc29e1..7f741acfbc 100644 --- a/jOOQ-examples/jOOQ-jpa-example/pom.xml +++ b/jOOQ-examples/jOOQ-jpa-example/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-jpa-example diff --git a/jOOQ-examples/jOOQ-kotlin-example/pom.xml b/jOOQ-examples/jOOQ-kotlin-example/pom.xml index 2df1852690..549dd945ed 100644 --- a/jOOQ-examples/jOOQ-kotlin-example/pom.xml +++ b/jOOQ-examples/jOOQ-kotlin-example/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-kotlin-example diff --git a/jOOQ-examples/jOOQ-oracle-example/pom.xml b/jOOQ-examples/jOOQ-oracle-example/pom.xml index 95ecfe4a1e..41b6d8e077 100644 --- a/jOOQ-examples/jOOQ-oracle-example/pom.xml +++ b/jOOQ-examples/jOOQ-oracle-example/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-oracle-example diff --git a/jOOQ-examples/jOOQ-r2dbc-example/pom.xml b/jOOQ-examples/jOOQ-r2dbc-example/pom.xml index 39fcd15b69..28c1fb3c63 100644 --- a/jOOQ-examples/jOOQ-r2dbc-example/pom.xml +++ b/jOOQ-examples/jOOQ-r2dbc-example/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-r2dbc-example diff --git a/jOOQ-examples/jOOQ-spark-chart-example/pom.xml b/jOOQ-examples/jOOQ-spark-chart-example/pom.xml index 27e6b40561..6e1e32227a 100644 --- a/jOOQ-examples/jOOQ-spark-chart-example/pom.xml +++ b/jOOQ-examples/jOOQ-spark-chart-example/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-spark-chart-example diff --git a/jOOQ-examples/jOOQ-spark-example/pom.xml b/jOOQ-examples/jOOQ-spark-example/pom.xml index fdfaab7306..6a1d4f9186 100644 --- a/jOOQ-examples/jOOQ-spark-example/pom.xml +++ b/jOOQ-examples/jOOQ-spark-example/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-spark-example diff --git a/jOOQ-examples/jOOQ-spring-boot-example/pom.xml b/jOOQ-examples/jOOQ-spring-boot-example/pom.xml index d36f17afc9..957ad39ff3 100644 --- a/jOOQ-examples/jOOQ-spring-boot-example/pom.xml +++ b/jOOQ-examples/jOOQ-spring-boot-example/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-spring-boot-example diff --git a/jOOQ-examples/jOOQ-spring-boot-example/src/main/java/org/jooq/example/spring/Application.java b/jOOQ-examples/jOOQ-spring-boot-example/src/main/java/org/jooq/example/spring/Application.java index b5df8b2eeb..477d7fa0e2 100644 --- a/jOOQ-examples/jOOQ-spring-boot-example/src/main/java/org/jooq/example/spring/Application.java +++ b/jOOQ-examples/jOOQ-spring-boot-example/src/main/java/org/jooq/example/spring/Application.java @@ -17,9 +17,9 @@ import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration; * connection. To work around this, use {@link SpringBootApplication#exclude()} * to explicitly exclude the {@link R2dbcAutoConfiguration}: *

- * 

+ * 

  * @SpringBootApplication(exclude = { R2dbcAutoConfiguration.class })
- * 

+ *
*

* However, it is recommended you upgrade to Spring Boot 2.6 instead. * diff --git a/jOOQ-examples/jOOQ-testcontainers-example/pom.xml b/jOOQ-examples/jOOQ-testcontainers-example/pom.xml index 55db03424e..31f6c9de7b 100644 --- a/jOOQ-examples/jOOQ-testcontainers-example/pom.xml +++ b/jOOQ-examples/jOOQ-testcontainers-example/pom.xml @@ -5,7 +5,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-testcontainers-example diff --git a/jOOQ-examples/jOOQ-testcontainers-flyway-example/pom.xml b/jOOQ-examples/jOOQ-testcontainers-flyway-example/pom.xml index 68305ee634..6bb768d690 100644 --- a/jOOQ-examples/jOOQ-testcontainers-flyway-example/pom.xml +++ b/jOOQ-examples/jOOQ-testcontainers-flyway-example/pom.xml @@ -5,7 +5,7 @@ org.jooq jooq-examples - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-testcontainers-flyway-example diff --git a/jOOQ-examples/pom.xml b/jOOQ-examples/pom.xml index 1aa35a39bb..90daf51b3d 100644 --- a/jOOQ-examples/pom.xml +++ b/jOOQ-examples/pom.xml @@ -13,7 +13,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT org.jooq diff --git a/jOOQ-jackson-extensions/pom.xml b/jOOQ-jackson-extensions/pom.xml index d63e7ae238..cd432e487b 100644 --- a/jOOQ-jackson-extensions/pom.xml +++ b/jOOQ-jackson-extensions/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-jackson-extensions diff --git a/jOOQ-kotlin-coroutines/pom.xml b/jOOQ-kotlin-coroutines/pom.xml index f2e38ea736..03d27ed9e6 100644 --- a/jOOQ-kotlin-coroutines/pom.xml +++ b/jOOQ-kotlin-coroutines/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-kotlin-coroutines diff --git a/jOOQ-kotlin/pom.xml b/jOOQ-kotlin/pom.xml index 847cbd1653..ed4929f71d 100644 --- a/jOOQ-kotlin/pom.xml +++ b/jOOQ-kotlin/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-kotlin diff --git a/jOOQ-meta-extensions-hibernate/pom.xml b/jOOQ-meta-extensions-hibernate/pom.xml index 4e9798bd44..c18fdda607 100644 --- a/jOOQ-meta-extensions-hibernate/pom.xml +++ b/jOOQ-meta-extensions-hibernate/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-meta-extensions-hibernate diff --git a/jOOQ-meta-extensions-liquibase/pom.xml b/jOOQ-meta-extensions-liquibase/pom.xml index a8e1100689..fcfc020aac 100644 --- a/jOOQ-meta-extensions-liquibase/pom.xml +++ b/jOOQ-meta-extensions-liquibase/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-meta-extensions-liquibase diff --git a/jOOQ-meta-extensions/pom.xml b/jOOQ-meta-extensions/pom.xml index d06baf37d4..dfe1fff6e0 100644 --- a/jOOQ-meta-extensions/pom.xml +++ b/jOOQ-meta-extensions/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-meta-extensions diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml index 343f2242e7..27ac7d714f 100644 --- a/jOOQ-meta/pom.xml +++ b/jOOQ-meta/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-meta diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java b/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java index 87308f5009..98f31fd49c 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java @@ -53,7 +53,7 @@ public final class Constants { /** * The latest jOOQ minor version. */ - public static final String MINOR_VERSION = "3.17"; + public static final String MINOR_VERSION = "3.18"; /** * The latest jOOQ version. @@ -61,7 +61,7 @@ public final class Constants { * This is the same as {@link #MINOR_VERSION}, but it may include patch * version suffixes. */ - public static final String VERSION = "3.17.1-SNAPSHOT"; + public static final String VERSION = "3.18.0-SNAPSHOT"; /** * The latest jOOQ full version. @@ -69,7 +69,7 @@ public final class Constants { * This is the same as {@link #VERSION}, but it may include release * candidate and other suffixes. */ - public static final String FULL_VERSION = "3.17.1-SNAPSHOT"; + public static final String FULL_VERSION = "3.18.0-SNAPSHOT"; /** * The current jooq-runtime XSD file name. @@ -170,6 +170,11 @@ public final class Constants { */ public static final String VERSION_3_17 = "3.17"; + /** + * The minor release 3.18. + */ + public static final String VERSION_3_18 = "3.18"; + /** * No further instances */ diff --git a/jOOQ-migrations/pom.xml b/jOOQ-migrations/pom.xml index b8ec9bf1b7..519c41554e 100644 --- a/jOOQ-migrations/pom.xml +++ b/jOOQ-migrations/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-migrations diff --git a/jOOQ-postgres-extensions/pom.xml b/jOOQ-postgres-extensions/pom.xml index 42952eb5be..3ea0c9daa0 100644 --- a/jOOQ-postgres-extensions/pom.xml +++ b/jOOQ-postgres-extensions/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-postgres-extensions diff --git a/jOOQ-scala_2.13/pom.xml b/jOOQ-scala_2.13/pom.xml index e2755b2e97..200e8c1489 100644 --- a/jOOQ-scala_2.13/pom.xml +++ b/jOOQ-scala_2.13/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-scala_2.13 diff --git a/jOOQ-xtend/pom.xml b/jOOQ-xtend/pom.xml index f0040a1237..1299423c37 100644 --- a/jOOQ-xtend/pom.xml +++ b/jOOQ-xtend/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq-xtend diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml index 442d18720f..5657172695 100644 --- a/jOOQ/pom.xml +++ b/jOOQ/pom.xml @@ -7,7 +7,7 @@ org.jooq jooq-parent - 3.17.1-SNAPSHOT + 3.18.0-SNAPSHOT jooq @@ -77,6 +77,17 @@ + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + -Xdoclint:html + -Xdoclint:html + + diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java index 32062954e4..9b13483e81 100644 --- a/jOOQ/src/main/java/org/jooq/Constants.java +++ b/jOOQ/src/main/java/org/jooq/Constants.java @@ -53,7 +53,7 @@ public final class Constants { /** * The latest jOOQ minor version. */ - public static final String MINOR_VERSION = "3.17"; + public static final String MINOR_VERSION = "3.18"; /** * The latest jOOQ version. @@ -61,7 +61,7 @@ public final class Constants { * This is the same as {@link #MINOR_VERSION}, but it may include patch * version suffixes. */ - public static final String VERSION = "3.17.1-SNAPSHOT"; + public static final String VERSION = "3.18.0-SNAPSHOT"; /** * The latest jOOQ full version. @@ -69,7 +69,7 @@ public final class Constants { * This is the same as {@link #VERSION}, but it may include release * candidate and other suffixes. */ - public static final String FULL_VERSION = "3.17.1-SNAPSHOT"; + public static final String FULL_VERSION = "3.18.0-SNAPSHOT"; /** * The current jooq-runtime XSD file name. @@ -170,6 +170,11 @@ public final class Constants { */ public static final String VERSION_3_17 = "3.17"; + /** + * The minor release 3.18. + */ + public static final String VERSION_3_18 = "3.18"; + /** * No further instances */