From 952f34b8287a507e42550bf6ed6b9d55465f4f9c Mon Sep 17 00:00:00 2001 From: izeye Date: Fri, 12 Jun 2015 16:55:28 +0900 Subject: [PATCH 1/2] Fix mbean server property `spring.jmx.server` was incorrectlyt documented as `spring.jmx.mbean-server` in the documentation. Closes gh-3211 --- .../src/main/asciidoc/appendix-application-properties.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index c95ecf896d..ec19fae62a 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -445,7 +445,7 @@ content into your application; rather pick only the properties that you need. # JMX spring.jmx.default-domain= # JMX domain name spring.jmx.enabled=true # Expose MBeans from Spring - spring.jmx.mbean-server=mBeanServer # MBeanServer bean name + spring.jmx.server=mBeanServer # MBeanServer bean name # RABBIT ({sc-spring-boot-autoconfigure}/amqp/RabbitProperties.{sc-ext}[RabbitProperties]) spring.rabbitmq.addresses= # connection addresses (e.g. myhost:9999,otherhost:1111) From bc4ae336f9964974c2c070b5d234f628922a47fa Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 13 Jun 2015 18:20:53 +0200 Subject: [PATCH 2/2] Fix meta-data for spring.jmx.server See gh-3211 --- .../META-INF/additional-spring-configuration-metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 52571ef7a2..1b0b8e1630 100644 --- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -99,7 +99,7 @@ "defaultValue": true }, { - "name": "spring.jmx.mbean-server", + "name": "spring.jmx.server", "type": "java.lang.String", "description": "MBeanServer bean name.", "defaultValue": "mBeanServer"