Browse Source

Merge pull request #13262 from lukaseder:master

* pr/13262:
  Polish "Reference the latest version of the jOOQ manual"
  Reference the latest version of the jOOQ manual
pull/13429/head
Stephane Nicoll 8 years ago
parent
commit
2140196f64
  1. 1
      spring-boot-docs/pom.xml
  2. 1
      spring-boot-docs/src/main/asciidoc/index.adoc
  3. 10
      spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

1
spring-boot-docs/pom.xml

@ -1009,6 +1009,7 @@ @@ -1009,6 +1009,7 @@
<doctype>book</doctype>
<attributes>
<docinfo>true</docinfo>
<jooq-version>${jooq.version}</jooq-version>
<spring-version>${spring.version}</spring-version>
<spring-boot-version>${project.version}</spring-boot-version>
<spring-boot-docs-version>${project.version}</spring-boot-docs-version>

1
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; @@ -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[]

10
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. @@ -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
http://www.jooq.org/doc/3.6/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 `<version>`
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 `<version>` 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]
----

Loading…
Cancel
Save