Skip to content

Commit a405c42

Browse files
committed
Merge branch '3.2.x' into 3.3.x
Closes gh-42285
2 parents 4e35050 + 03e7be3 commit a405c42

File tree

3 files changed

+6
-1
lines changed
  • spring-boot-project
    • spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx
    • spring-boot-dependencies
    • spring-boot-docs/src/docs/antora/modules/reference/pages/actuator

3 files changed

+6
-1
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public class JmxProperties {
3030

3131
/**
32-
* Expose management beans to the JMX domain.
32+
* Expose Spring's management beans to the JMX domain.
3333
*/
3434
private boolean enabled = false;
3535

spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,7 @@ bom {
11181118
}
11191119
links {
11201120
site("https://logging.apache.org/log4j")
1121+
docs { version -> "https://logging.apache.org/log4j/%s.x/manual".formatted(version.major()) }
11211122
releaseNotes("https://github.com/apache/logging-log4j2/releases/tag/rel%2F{version}")
11221123
}
11231124
}
@@ -1591,6 +1592,7 @@ bom {
15911592
}
15921593
links {
15931594
site("https://github.com/quartz-scheduler/quartz")
1595+
javadoc("https://www.javadoc.io/doc/org.quartz-scheduler/quartz/{version}")
15941596
}
15951597
}
15961598
library("QueryDSL", "5.1.0") {

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/jmx.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ Any of your beans that are annotated with Spring JMX annotations (`@ManagedResou
1010
If your platform provides a standard `MBeanServer`, Spring Boot uses that and defaults to the VM `MBeanServer`, if necessary.
1111
If all that fails, a new `MBeanServer` is created.
1212

13+
NOTE: `spring.jmx.enabled` affects only the management beans provided by Spring.
14+
Enabling management beans provided by other libraries (for example {url-log4j2-docs}/jmx.html[Log4j2] or {url-quartz-javadoc}/constant-values.html#org.quartz.impl.StdSchedulerFactory.PROP_SCHED_JMX_EXPORT[Quartz]) is independent.
15+
1316
See the {code-spring-boot-autoconfigure-src}/jmx/JmxAutoConfiguration.java[`JmxAutoConfiguration`] class for more details.
1417

1518
By default, Spring Boot also exposes management endpoints as JMX MBeans under the `org.springframework.boot` domain.

0 commit comments

Comments
 (0)