Merge branch '1.4.x' into 1.5.x

8 years ago · cc79f6d83d
parent cd8684499d f72e0c08df
commit cc79f6d83d
1 changed files with 10 additions and 0 deletions
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@ -4372,6 +4372,16 @@ ActiveMQ configuration is controlled by external configuration properties in
 	spring.activemq.password=secret
 ----

+You can also pool JMS resources by adding a dependency to
+`org.apache.activemq:activemq-pool` and configure the `PooledConnectionFactory`
+accordingly:
+
+[source,properties,indent=0]
+----
+	spring.activemq.pool.enabled=true
+	spring.activemq.pool.max-connections=50
+----
+
 See
 {sc-spring-boot-autoconfigure}/jms/activemq/ActiveMQProperties.{sc-ext}[`ActiveMQProperties`]
 for more of the supported options.