Skip to content

Commit

Permalink
Merge branch '3.3.x'
Browse files Browse the repository at this point in the history
Closes gh-42286
  • Loading branch information
philwebb committed Sep 13, 2024
2 parents 3723a9e + a405c42 commit dab5326
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
public class JmxProperties {

/**
* Expose management beans to the JMX domain.
* Expose Spring's management beans to the JMX domain.
*/
private boolean enabled = false;

Expand Down
2 changes: 2 additions & 0 deletions spring-boot-project/spring-boot-dependencies/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -1139,6 +1139,7 @@ bom {
}
links {
site("https://logging.apache.org/log4j")
docs { version -> "https://logging.apache.org/log4j/%s.x/manual".formatted(version.major()) }
releaseNotes("https://github.com/apache/logging-log4j2/releases/tag/rel%2F{version}")
}
}
Expand Down Expand Up @@ -1582,6 +1583,7 @@ bom {
}
links {
site("https://github.com/quartz-scheduler/quartz")
javadoc("https://www.javadoc.io/doc/org.quartz-scheduler/quartz/{version}")
}
}
library("QueryDSL", "5.1.0") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ Any of your beans that are annotated with Spring JMX annotations (`@ManagedResou
If your platform provides a standard `MBeanServer`, Spring Boot uses that and defaults to the VM `MBeanServer`, if necessary.
If all that fails, a new `MBeanServer` is created.

NOTE: `spring.jmx.enabled` affects only the management beans provided by Spring.
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.

See the {code-spring-boot-autoconfigure-src}/jmx/JmxAutoConfiguration.java[`JmxAutoConfiguration`] class for more details.

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

0 comments on commit dab5326

Please sign in to comment.