Merge branch '5.3.x'

# Conflicts:
#	build.gradle
#	spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
#	spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
#	src/docs/asciidoc/web-reactive.adoc

build.gradle

@@ -66,7 +66,7 @@ configure(allprojects) { project ->
 
 			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
 			dependency "io.smallrye.reactive:mutiny:1.0.0"
-			dependency "io.projectreactor.tools:blockhound:1.0.4.RELEASE"
+			dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"
 
 			dependency "com.caucho:hessian:4.0.63"
 			dependency "com.fasterxml:aalto-xml:1.3.0"
@@ -74,7 +74,7 @@ configure(allprojects) { project ->
 				exclude group: "stax", name: "stax-api"
 			}
 			dependency "com.google.code.gson:gson:2.8.8"
-			dependency "com.google.protobuf:protobuf-java-util:3.17.3"
+			dependency "com.google.protobuf:protobuf-java-util:3.18.0"
 			dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
 			dependency("com.thoughtworks.xstream:xstream:1.4.18") {
 				exclude group: "xpp3", name: "xpp3_min"
@@ -88,9 +88,9 @@ configure(allprojects) { project ->
 			dependency "org.yaml:snakeyaml:1.29"
 
 			dependency "com.h2database:h2:1.4.200"
-			dependency "com.github.ben-manes.caffeine:caffeine:2.9.1"
+			dependency "com.github.ben-manes.caffeine:caffeine:2.9.2"
 			dependency "com.github.librepdf:openpdf:1.3.26"
-			dependency "com.rometools:rome:1.15.0"
+			dependency "com.rometools:rome:1.16.0"
 			dependency "commons-io:commons-io:2.5"
 			dependency "io.vavr:vavr:0.10.3"
 			dependency "net.sf.jopt-simple:jopt-simple:5.0.4"

spring-beans/src/main/java/org/springframework/beans/BeanUtils.java

@@ -254,14 +254,13 @@ public abstract class BeanUtils {
 				return (Constructor<T>) ctors[0];
 			}
 		}
-		else {
-			// Several public constructors -> let's take the default constructor
-			try {
-				return clazz.getDeclaredConstructor();
-			}
-			catch (NoSuchMethodException ex) {
-				// Giving up...
-			}
+
+		// Several constructors -> let's try to take the default constructor
+		try {
+			return clazz.getDeclaredConstructor();
+		}
+		catch (NoSuchMethodException ex) {
+			// Giving up...
 		}
 
 		// No unique constructor at all

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java

@@ -352,7 +352,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 				else {
 					String scopeName = mbd.getScope();
 					if (!StringUtils.hasLength(scopeName)) {
-						throw new IllegalStateException("No scope name defined for bean ´" + beanName + "'");
+						throw new IllegalStateException("No scope name defined for bean '" + beanName + "'");
 					}
 					Scope scope = this.scopes.get(scopeName);
 					if (scope == null) {

spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java

@@ -43,7 +43,7 @@ import org.springframework.util.ConcurrentReferenceHashMap;
  * {@code Observable}, and others.
  *
  * <p>By default, depending on classpath availability, adapters are registered
- * for Reactor, RxJava 2/3, {@link CompletableFuture}, {@code Flow.Publisher},
+ * for Reactor, RxJava 3, {@link CompletableFuture}, {@code Flow.Publisher},
  * and Kotlin Coroutines' {@code Deferred} and {@code Flow}.
  *
  * @author Rossen Stoyanchev

spring-core/src/test/java/org/springframework/util/StopWatchTests.java

@@ -97,6 +97,8 @@ class StopWatchTests {
 		assertThat(stopWatch.currentTaskName()).isEqualTo(name2);
 		stopWatch.stop();
 		assertThat(stopWatch.isRunning()).isFalse();
+
+		/* Flaky StopWatch time assertions...
 		assertThat(stopWatch.getLastTaskTimeNanos())
 			.as("last task time in nanoseconds for task #2")
 			.isGreaterThanOrEqualTo(millisToNanos(duration2))
@@ -109,6 +111,7 @@ class StopWatchTests {
 			.as("total time in seconds for task #2")
 			.isGreaterThanOrEqualTo((duration1 + duration2 - fudgeFactor) / 1000.0)
 			.isLessThanOrEqualTo((duration1 + duration2 + fudgeFactor) / 1000.0);
+		*/
 
 		assertThat(stopWatch.getTaskCount()).isEqualTo(2);
 		assertThat(stopWatch.prettyPrint()).contains(name1, name2);

spring-expression/src/main/java/org/springframework/expression/BeanResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -19,7 +19,7 @@ package org.springframework.expression;
 /**
  * A bean resolver can be registered with the evaluation context and will kick in
  * for bean references: {@code @myBeanName} and {@code &myBeanName} expressions.
- * The <tt>&</tt> variant syntax allows access to the factory bean where relevant.
+ * The {@code &} variant syntax allows access to the factory bean where relevant.
  *
  * @author Andy Clement
  * @since 3.0.3
@@ -28,7 +28,7 @@ public interface BeanResolver {
 
 	/**
 	 * Look up a bean by the given name and return a corresponding instance for it.
-	 * For attempting access to a factory bean, the name needs a <tt>&</tt> prefix.
+	 * For attempting access to a factory bean, the name needs a {@code &} prefix.
 	 * @param context the current evaluation context
 	 * @param beanName the name of the bean to look up
 	 * @return an object representing the bean

spring-expression/src/main/java/org/springframework/expression/TypeComparator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -40,10 +40,11 @@ public interface TypeComparator {
 	 * Compare two given objects.
 	 * @param firstObject the first object
 	 * @param secondObject the second object
-	 * @return 0 if they are equal, <0 if the first is smaller than the second,
-	 * or >0 if the first is larger than the second
+	 * @return 0 if they are equal, a negative integer if the first is smaller than
+	 * the second, or a positive integer if the first is larger than the second
 	 * @throws EvaluationException if a problem occurs during comparison
 	 * (or if they are not comparable in the first place)
+	 * @see Comparable#compareTo
 	 */
 	int compare(@Nullable Object firstObject, @Nullable Object secondObject) throws EvaluationException;
 

spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java

@@ -25,8 +25,8 @@ import org.springframework.expression.spel.SpelEvaluationException;
 import org.springframework.expression.spel.SpelMessage;
 
 /**
- * Represents a bean reference to a type, for example <tt>@foo</tt> or <tt>@'foo.bar'</tt>.
- * For a FactoryBean the syntax <tt>&foo</tt> can be used to access the factory itself.
+ * Represents a bean reference to a type, for example {@code @foo} or {@code @'foo.bar'}.
+ * For a FactoryBean the syntax {@code &foo} can be used to access the factory itself.
  *
  * @author Andy Clement
  */