Merge branch '3.3.x'

Closes gh-42721

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/io/caching.adoc

@@ -13,7 +13,7 @@ In a nutshell, to add caching to an operation of your service add the relevant a
 include-code::MyMathService[]
 
 This example demonstrates the use of caching on a potentially costly operation.
-Before invoking `computePiDecimal`, the abstraction looks for an entry in the `piDecimals` cache that matches the `i` argument.
+Before invoking `computePiDecimal`, the abstraction looks for an entry in the `piDecimals` cache that matches the `precision` argument.
 If an entry is found, the content in the cache is immediately returned to the caller, and the method is not invoked.
 Otherwise, the method is invoked, and the cache is updated before returning the value.
 

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/io/jta.adoc

@@ -26,18 +26,18 @@ Spring Boot tries to auto-configure JMS by looking for a `ConnectionFactory` at
 When using JTA, the primary JMS `ConnectionFactory` bean is XA-aware and participates in distributed transactions.
 You can inject into your bean without needing to use any `@Qualifier`:
 
-include-code::primary/MyBean[tag=*]
+include-code::primary/MyBean[]
 
 In some situations, you might want to process certain JMS messages by using a non-XA `ConnectionFactory`.
 For example, your JMS processing logic might take longer than the XA timeout.
 
 If you want to use a non-XA `ConnectionFactory`, you can the `nonXaJmsConnectionFactory` bean:
 
-include-code::nonxa/MyBean[tag=*]
+include-code::nonxa/MyBean[]
 
 For consistency, the `jmsConnectionFactory` bean is also provided by using the bean alias `xaJmsConnectionFactory`:
 
-include-code::xa/MyBean[tag=*]
+include-code::xa/MyBean[]
 
 
 

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/messaging/amqp.adoc

@@ -110,7 +110,7 @@ The following sample component creates a listener endpoint on the `someQueue` qu
 
 include-code::MyBean[]
 
-TIP: See javadoc:{url-spring-amqp-javadoc}/org.springframework.amqp.rabbit.annotation.EnableRabbit.html[format=annotation] for more details.
+TIP: See javadoc:{url-spring-amqp-javadoc}/org.springframework.amqp.rabbit.annotation.EnableRabbit[format=annotation] for more details.
 
 If you need to create more `RabbitListenerContainerFactory` instances or if you want to override the default, Spring Boot provides a `SimpleRabbitListenerContainerFactoryConfigurer` and a `DirectRabbitListenerContainerFactoryConfigurer` that you can use to initialize a `SimpleRabbitListenerContainerFactory` and a `DirectRabbitListenerContainerFactory` with the same settings as the factories used by the auto-configuration.
 

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/io/jta/mixingxaandnonxaconnections/nonxa/MyBean.java

@@ -22,10 +22,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
 
 public class MyBean {
 
-	// tag::code[]
 	public MyBean(@Qualifier("nonXaJmsConnectionFactory") ConnectionFactory connectionFactory) {
 		// ...
 	}
-	// end::code[]
 
 }

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/io/jta/mixingxaandnonxaconnections/primary/MyBean.java

@@ -20,10 +20,8 @@ import jakarta.jms.ConnectionFactory;
 
 public class MyBean {
 
-	// tag::code[]
 	public MyBean(ConnectionFactory connectionFactory) {
 		// ...
 	}
-	// end::code[]
 
 }

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/io/jta/mixingxaandnonxaconnections/xa/MyBean.java

@@ -22,10 +22,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
 
 public class MyBean {
 
-	// tag::code[]
 	public MyBean(@Qualifier("xaJmsConnectionFactory") ConnectionFactory connectionFactory) {
 		// ...
 	}
-	// end::code[]
 
 }