Merge branch '6.1.x'

# Conflicts:
#	framework-platform/framework-platform.gradle
#	spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpConnector.java

Author: jhoeller

spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurer.java

@@ -32,6 +32,10 @@
  * {@link #cacheManager()}, {@link #cacheResolver()}, {@link #keyGenerator()}, and
  * {@link #errorHandler()} for detailed instructions.
  *
+ * <p><b>NOTE: A {@code CachingConfigurer} will get initialized early.</b>
+ * Do not inject common dependencies into autowired fields directly; instead, consider
+ * declaring a lazy {@link org.springframework.beans.factory.ObjectProvider} for those.
+ *
  * @author Chris Beams
  * @author Stephane Nicoll
  * @since 3.1

spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java

@@ -195,6 +195,11 @@ public void setTaskTerminationTimeout(long timeout) {
 	 * The default of -1 indicates no concurrency limit at all.
 	 * <p>This is the equivalent of a maximum pool size in a thread pool,
 	 * preventing temporary overload of the thread management system.
+	 * However, in contrast to a thread pool with a managed task queue,
+	 * this executor will block the submitter until the task can be
+	 * accepted when the configured concurrency limit has been reached.
+	 * If you prefer queue-based task hand-offs without such blocking,
+	 * consider using a {@code ThreadPoolTaskExecutor} instead.
 	 * @see #UNBOUNDED_CONCURRENCY
 	 * @see org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor#setMaxPoolSize
 	 */

spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,10 @@
  * <p>See @{@link EnableTransactionManagement} for general examples and context;
  * see {@link #annotationDrivenTransactionManager()} for detailed instructions.
  *
+ * <p><b>NOTE: A {@code TransactionManagementConfigurer} will get initialized early.</b>
+ * Do not inject common dependencies into autowired fields directly; instead, consider
+ * declaring a lazy {@link org.springframework.beans.factory.ObjectProvider} for those.
+ *
  * <p>Note that in by-type lookup disambiguation cases, an alternative approach to
  * implementing this interface is to simply mark one of the offending
  * {@code PlatformTransactionManager} {@code @Bean} methods (or

spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpConnector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java

@@ -287,48 +287,18 @@ public void toByteBuffer(int srcPos, ByteBuffer dest, int destPos, int length) {
 
 		@Override
 		public ByteBufferIterator readableByteBuffers() {
-			ByteBufferIterator delegateIterator = this.delegate.readableByteBuffers();
-			return new JettyByteBufferIterator(delegateIterator);
+			return this.delegate.readableByteBuffers();
 		}
 
 		@Override
 		public ByteBufferIterator writableByteBuffers() {
-			ByteBufferIterator delegateIterator = this.delegate.writableByteBuffers();
-			return new JettyByteBufferIterator(delegateIterator);
+			return this.delegate.writableByteBuffers();
 		}
 
 		@Override
 		public String toString(int index, int length, Charset charset) {
 			return this.delegate.toString(index, length, charset);
 		}
-
-
-		private static class JettyByteBufferIterator implements ByteBufferIterator {
-
-			private final ByteBufferIterator delegate;
-
-
-			JettyByteBufferIterator(ByteBufferIterator delegate) {
-				Assert.notNull(delegate, "Delegate must not be null");
-
-				this.delegate = delegate;
-			}
-
-			@Override
-			public void close() {
-				this.delegate.close();
-			}
-
-			@Override
-			public boolean hasNext() {
-				return this.delegate.hasNext();
-			}
-
-			@Override
-			public ByteBuffer next() {
-				return this.delegate.next();
-			}
-		}
 	}
 
 }