Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source 
Closes gh-17547
This commit is contained in:
Stephane Nicoll
2019-07-17 10:30:36 +02:00
parent 73f7a9318f a64317b114
commit 3a49996dbd
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1466,6 +1466,7 @@
<spring-boot-version>${revision}</spring-boot-version>
<spring-docs-version>${spring-framework.version}</spring-docs-version>
<spring-framework-version>${spring-framework.version}</spring-framework-version>
<spring-integration-docs-version>${spring-integration.version}</spring-integration-docs-version>
<spring-security-docs-version>${spring-security.version}</spring-security-docs-version>
<spring-webservices-docs-version>${spring-ws.version}</spring-webservices-docs-version>
</attributes>

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

@@ -49,6 +49,7 @@
:spring-initializr-reference: https://docs.spring.io/initializr/docs/current/reference/html
:spring-rest-docs: https://projects.spring.io/spring-restdocs/
:spring-integration: https://projects.spring.io/spring-integration/
:spring-integration-reference: https://docs.spring.io/spring-integration/docs/{spring-integration-docs-version}/reference/html
:spring-session: https://projects.spring.io/spring-session/
:spring-framework: https://projects.spring.io/spring-framework/
:spring-security: https://projects.spring.io/spring-security/

2
spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
View File

@@ -1792,7 +1792,7 @@ Spring Boot registers the following core metrics when applicable:
application's absolute start time
* Tomcat metrics (`server.tomcat.mbeanregistry.enabled` must be set to `true` for all
Tomcat metrics to be registered)
* https://docs.spring.io/spring-integration/docs/current/reference/html/system-management-chapter.html#micrometer-integration[Spring Integration] metrics
* {spring-integration-reference}#micrometer-integration[Spring Integration] metrics