From cb1530d38eedb7f524bd0ea495d8307241946e56 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 25 May 2018 14:43:24 +0200 Subject: [PATCH 1/2] Reference the latest version of the jOOQ manual See gh-13262 --- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 7c4300dbb04..ab3c5d1540e 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -3210,7 +3210,7 @@ commercial and open source editions can be used with Spring Boot. ==== Code Generation In order to use jOOQ type-safe queries, you need to generate Java classes from your database schema. You can follow the instructions in the -http://www.jooq.org/doc/3.6/manual-single-page/#jooq-in-7-steps-step3[jOOQ user manual]. +https://www.jooq.org/doc/latest/manual-single-page/#jooq-in-7-steps-step3[jOOQ user manual]. If you are using the `jooq-codegen-maven` plugin (and you also use the `spring-boot-starter-parent` "`parent POM`") you can safely omit the plugin's `` tag. You can also use Spring Boot defined version variables (e.g. `h2.version`) to From fcd8e0fad31f366ac38b7b2cf4dda90ab73ee26b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 28 May 2018 10:44:07 +0200 Subject: [PATCH 2/2] Polish "Reference the latest version of the jOOQ manual" Closes gh-13262 --- spring-boot-docs/pom.xml | 1 + spring-boot-docs/src/main/asciidoc/index.adoc | 1 + .../src/main/asciidoc/spring-boot-features.adoc | 10 +++++----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml index bbf1c84ee87..3ee2f1633db 100644 --- a/spring-boot-docs/pom.xml +++ b/spring-boot-docs/pom.xml @@ -1009,6 +1009,7 @@ book true + ${jooq.version} ${spring.version} ${project.version} ${project.version} diff --git a/spring-boot-docs/src/main/asciidoc/index.adoc b/spring-boot-docs/src/main/asciidoc/index.adoc index 5513ad91090..a76259b7494 100644 --- a/spring-boot-docs/src/main/asciidoc/index.adoc +++ b/spring-boot-docs/src/main/asciidoc/index.adoc @@ -52,6 +52,7 @@ Phillip Webb; Dave Syer; Josh Long; Stéphane Nicoll; Rob Winch; Andy Wilkinson; :test-examples: ../../test/java/org/springframework/boot :gradle-user-guide: https://docs.gradle.org/2.14.1/userguide :gradle-dsl: https://docs.gradle.org/2.14.1/dsl +:jooq-manual: https://www.jooq.org/doc/{jooq-version}/manual-single-page // ====================================================================================== include::documentation-overview.adoc[] diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index ab3c5d1540e..7c4dc0ef4e8 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -3210,11 +3210,11 @@ commercial and open source editions can be used with Spring Boot. ==== Code Generation In order to use jOOQ type-safe queries, you need to generate Java classes from your database schema. You can follow the instructions in the -https://www.jooq.org/doc/latest/manual-single-page/#jooq-in-7-steps-step3[jOOQ user manual]. -If you are using the `jooq-codegen-maven` plugin (and you also use the -`spring-boot-starter-parent` "`parent POM`") you can safely omit the plugin's `` -tag. You can also use Spring Boot defined version variables (e.g. `h2.version`) to -declare the plugin's database dependency. Here's an example: +{jooq-manual}/#jooq-in-7-steps-step3[jOOQ user manual]. If you are using the +`jooq-codegen-maven` plugin (and you also use the `spring-boot-starter-parent` +"`parent POM`") you can safely omit the plugin's `` tag. You can also use Spring +Boot defined version variables (e.g. `h2.version`) to declare the plugin's database +dependency. Here's an example: [source,xml,indent=0] ----