root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-05-28 10:52:42 +02:00
parent de01e7aad4 15ba50ab3e
commit ec65cb1753
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-docs/pom.xml
View File

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

1
spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc
View File

@ -67,6 +67,7 @@ Phillip Webb; Dave Syer; Josh Long; Stéphane Nicoll; Rob Winch; Andy Wilkinson;
:gradle-user-guide: https://docs.gradle.org/4.2.1/userguide :gradle-user-guide: https://docs.gradle.org/4.2.1/userguide
:hibernate-documentation: https://docs.jboss.org/hibernate/orm/5.2/userguide/html_single/Hibernate_User_Guide.html :hibernate-documentation: https://docs.jboss.org/hibernate/orm/5.2/userguide/html_single/Hibernate_User_Guide.html
:jetty-documentation: https://www.eclipse.org/jetty/documentation/9.4.x :jetty-documentation: https://www.eclipse.org/jetty/documentation/9.4.x
:jooq-manual: https://www.jooq.org/doc/{jooq-version}/manual-single-page
:micrometer-concepts-documentation: https://micrometer.io/docs/concepts :micrometer-concepts-documentation: https://micrometer.io/docs/concepts
:micrometer-registry-documentation: http://micrometer.io/docs/registry :micrometer-registry-documentation: http://micrometer.io/docs/registry
:tomcat-documentation: https://tomcat.apache.org/tomcat-8.5-doc :tomcat-documentation: https://tomcat.apache.org/tomcat-8.5-doc

10
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -3678,11 +3678,11 @@ commercial and open source editions can be used with Spring Boot.
==== Code Generation ==== Code Generation
In order to use jOOQ type-safe queries, you need to generate Java classes from your 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 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]. {jooq-manual}/#jooq-in-7-steps-step3[jOOQ user manual]. If you use the
If you use the `jooq-codegen-maven` plugin and you also use the `jooq-codegen-maven` plugin and you also use the `spring-boot-starter-parent`
`spring-boot-starter-parent` "`parent POM`", you can safely omit the plugin's `<version>` "`parent POM`", you can safely omit the plugin's `<version>` tag. You can also use Spring
tag. You can also use Spring Boot-defined version variables (such as `h2.version`) to Boot-defined version variables (such as `h2.version`) to declare the plugin's database
declare the plugin's database dependency. The following listing shows an example: dependency. The following listing shows an example:
[source,xml,indent=0] [source,xml,indent=0]
---- ----