Merge branch '3.3.x' into redis-stack-service-connection

Author: eddumelendez

buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitecturePlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-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.
@@ -51,6 +51,7 @@ private void registerTasks(Project project) {
 						(task) -> {
 							task.setClasses(sourceSet.getOutput().getClassesDirs());
 							task.getResourcesDirectory().set(sourceSet.getOutput().getResourcesDir());
+							task.dependsOn(sourceSet.getProcessResourcesTaskName());
 							task.setDescription("Checks the architecture of the classes of the " + sourceSet.getName()
 									+ " source set.");
 							task.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP);

buildSrc/src/main/java/org/springframework/boot/build/bom/Library.java

@@ -33,7 +33,6 @@
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.artifacts.result.DependencyResult;
 
 import org.springframework.boot.build.bom.bomr.version.DependencyVersion;
@@ -398,17 +397,10 @@ public static class VersionAlignment {
 		}
 
 		public Set<String> resolve() {
-			if (this.managedBy == null) {
-				throw new IllegalStateException("Version alignment without managedBy is not supported");
-			}
 			if (this.alignedVersions != null) {
 				return this.alignedVersions;
 			}
-			Library managingLibrary = this.libraries.stream()
-				.filter((candidate) -> this.managedBy.equals(candidate.getName()))
-				.findFirst()
-				.orElseThrow(() -> new IllegalStateException("Managing library '" + this.managedBy + "' not found."));
-			Map<String, String> versions = resolveAligningDependencies(managingLibrary);
+			Map<String, String> versions = resolveAligningDependencies();
 			Set<String> versionsInLibrary = new HashSet<>();
 			for (Group group : this.groups) {
 				for (Module module : group.getModules()) {
@@ -428,18 +420,8 @@ public Set<String> resolve() {
 			return this.alignedVersions;
 		}
 
-		private Map<String, String> resolveAligningDependencies(Library manager) {
-			DependencyHandler dependencyHandler = this.project.getDependencies();
-			List<Dependency> boms = manager.getGroups()
-				.stream()
-				.flatMap((group) -> group.getBoms()
-					.stream()
-					.map((bom) -> dependencyHandler
-						.platform(group.getId() + ":" + bom + ":" + manager.getVersion().getVersion())))
-				.toList();
-			List<Dependency> dependencies = new ArrayList<>();
-			dependencies.addAll(boms);
-			dependencies.add(dependencyHandler.create(this.from));
+		private Map<String, String> resolveAligningDependencies() {
+			List<Dependency> dependencies = getAligningDependencies();
 			Configuration alignmentConfiguration = this.project.getConfigurations()
 				.detachedConfiguration(dependencies.toArray(new Dependency[0]));
 			Map<String, String> versions = new HashMap<>();
@@ -452,6 +434,58 @@ private Map<String, String> resolveAligningDependencies(Library manager) {
 			return versions;
 		}
 
+		private List<Dependency> getAligningDependencies() {
+			if (this.managedBy == null) {
+				Library fromLibrary = findFromLibrary();
+				return List
+					.of(this.project.getDependencies().create(this.from + ":" + fromLibrary.getVersion().getVersion()));
+			}
+			else {
+				Library managingLibrary = findManagingLibrary();
+				List<Dependency> boms = getBomDependencies(managingLibrary);
+				List<Dependency> dependencies = new ArrayList<>();
+				dependencies.addAll(boms);
+				dependencies.add(this.project.getDependencies().create(this.from));
+				return dependencies;
+			}
+		}
+
+		private Library findFromLibrary() {
+			for (Library library : this.libraries) {
+				for (Group group : library.getGroups()) {
+					for (Module module : group.getModules()) {
+						if (this.from.equals(group.getId() + ":" + module.getName())) {
+							return library;
+						}
+					}
+				}
+			}
+			return null;
+		}
+
+		private Library findManagingLibrary() {
+			if (this.managedBy == null) {
+				return null;
+			}
+			return this.libraries.stream()
+				.filter((candidate) -> this.managedBy.equals(candidate.getName()))
+				.findFirst()
+				.orElseThrow(() -> new IllegalStateException("Managing library '" + this.managedBy + "' not found."));
+		}
+
+		private List<Dependency> getBomDependencies(Library manager) {
+			if (manager == null) {
+				return Collections.emptyList();
+			}
+			return manager.getGroups()
+				.stream()
+				.flatMap((group) -> group.getBoms()
+					.stream()
+					.map((bom) -> this.project.getDependencies()
+						.platform(group.getId() + ":" + bom + ":" + manager.getVersion().getVersion())))
+				.toList();
+		}
+
 		String getFrom() {
 			return this.from;
 		}
@@ -462,7 +496,11 @@ String getManagedBy() {
 
 		@Override
 		public String toString() {
-			return "version from dependencies of " + this.from + " that is managed by " + this.managedBy;
+			String result = "version from dependencies of " + this.from;
+			if (this.managedBy != null) {
+				result += " that is managed by " + this.managedBy;
+			}
+			return result;
 		}
 
 	}

gradle.properties

@@ -9,8 +9,8 @@ assertjVersion=3.25.3
 commonsCodecVersion=1.16.1
 graalVersion=22.3
 hamcrestVersion=2.2
-jacksonVersion=2.17.1
-junitJupiterVersion=5.10.2
+jacksonVersion=2.17.2
+junitJupiterVersion=5.10.3
 kotlinVersion=1.9.24
 mavenVersion=3.9.4
 nativeBuildToolsVersion=0.10.2

settings.gradle

@@ -19,8 +19,8 @@ pluginManagement {
 }
 
 plugins {
-	id "com.gradle.develocity" version "3.17.2"
-	id "io.spring.ge.conventions" version "0.0.17"
+	id "com.gradle.develocity" version "3.17.5"
+	id "io.spring.develocity.conventions" version "0.0.19"
 }
 
 rootProject.name="spring-boot-build"
@@ -35,13 +35,6 @@ settings.gradle.projectsLoaded {
 				value('Toolchain version', toolchainVersion)
 				tag("JDK-$toolchainVersion")
 			}
-			def buildDir = settings.gradle.rootProject.getBuildDir()
-			buildDir.mkdirs()
-			new File(buildDir, "build-scan-uri.txt").text = "build scan not generated"
-			buildScanPublished { scan ->
-				buildDir.mkdirs()
-				new File(buildDir, "build-scan-uri.txt").text = "<${scan.buildScanUri}|build scan>\n"
-			}
 		}
 	}
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitTemplateConfigurer.java

@@ -108,17 +108,17 @@ public void configure(RabbitTemplate template, ConnectionFactory connectionFacto
 		map.from(templateProperties::isObservationEnabled).to(template::setObservationEnabled);
 		map.from(templateProperties::getAllowedListPatterns)
 			.whenNot(CollectionUtils::isEmpty)
-			.to((allowListPatterns) -> setAllowedListPatterns(template.getMessageConverter(), allowListPatterns));
+			.to((allowedListPatterns) -> setAllowedListPatterns(template.getMessageConverter(), allowedListPatterns));
 	}
 
-	private void setAllowedListPatterns(MessageConverter messageConverter, List<String> allowListPatterns) {
+	private void setAllowedListPatterns(MessageConverter messageConverter, List<String> allowedListPatterns) {
 		if (messageConverter instanceof AllowedListDeserializingMessageConverter allowedListDeserializingMessageConverter) {
-			allowedListDeserializingMessageConverter.setAllowedListPatterns(allowListPatterns);
+			allowedListDeserializingMessageConverter.setAllowedListPatterns(allowedListPatterns);
 			return;
 		}
-		throw new InvalidConfigurationPropertyValueException("spring.rabbitmq.template.allow-list-patterns",
-				allowListPatterns,
-				"Allow list patterns can only be applied to a AllowedListDeserializingMessageConverter");
+		throw new InvalidConfigurationPropertyValueException("spring.rabbitmq.template.allowed-list-patterns",
+				allowedListPatterns,
+				"Allowed list patterns can only be applied to an AllowedListDeserializingMessageConverter");
 	}
 
 	private boolean determineMandatoryFlag() {

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -155,7 +155,7 @@ bom {
 			releaseNotes("https://github.com/mojohaus/build-helper-maven-plugin/releases/tag/{version}")
 		}
 	}
-	library("Byte Buddy", "1.14.17") {
+	library("Byte Buddy", "1.14.18") {
 		group("net.bytebuddy") {
 			modules = [
 				"byte-buddy",
@@ -306,7 +306,7 @@ bom {
 			]
 		}
 	}
-	library("Dependency Management Plugin", "1.1.5") {
+	library("Dependency Management Plugin", "1.1.6") {
 		group("io.spring.gradle") {
 			modules = [
 				"dependency-management-plugin"
@@ -441,11 +441,16 @@ bom {
 			]
 		}
 	}
-	library("GraphQL Java", "22.0") {
+	library("GraphQL Java", "22.1") {
 		prohibit {
 			startsWith(["2018-", "2019-", "2020-", "2021-", "230521-"])
 			because "These are snapshots that we don't want to see"
 		}
+		alignWith {
+			version {
+				from "org.springframework.graphql:spring-graphql"
+			}
+		}
 		group("com.graphql-java") {
 			modules = [
 					"graphql-java"
@@ -456,7 +461,7 @@ bom {
 			releaseNotes("https://github.com/graphql-java/graphql-java/releases/tag/v{version}")
 		}
 	}
-	library("Groovy", "4.0.21") {
+	library("Groovy", "4.0.22") {
 		group("org.apache.groovy") {
 			imports = [
 				"groovy-bom"
@@ -602,7 +607,7 @@ bom {
 			]
 		}
 	}
-	library("HttpCore5", "5.2.4") {
+	library("HttpCore5", "5.2.5") {
 		group("org.apache.httpcomponents.core5") {
 			modules = [
 				"httpcore5",
@@ -859,7 +864,7 @@ bom {
 			]
 		}
 	}
-	library("Jetty", "12.0.10") {
+	library("Jetty", "12.0.11") {
 		group("org.eclipse.jetty.ee10") {
 			imports = [
 				"jetty-ee10-bom"
@@ -923,7 +928,7 @@ bom {
 			releaseNotes("https://github.com/netplex/json-smart-v2/releases/tag/{version}")
 		}
 	}
-	library("JsonAssert", "1.5.1") {
+	library("JsonAssert", "1.5.3") {
 		group("org.skyscreamer") {
 			modules = [
 				"jsonassert"
@@ -961,7 +966,7 @@ bom {
 			releaseNotes("https://junit.org/junit5/docs/{version}/release-notes")
 		}
 	}
-	library("Kafka", "3.7.0") {
+	library("Kafka", "3.7.1") {
 		group("org.apache.kafka") {
 			modules = [
 				"connect",
@@ -1095,7 +1100,7 @@ bom {
 			site("https://logback.qos.ch")
 		}
 	}
-	library("Lombok", "1.18.32") {
+	library("Lombok", "1.18.34") {
 		group("org.projectlombok") {
 			modules = [
 				"lombok"
@@ -1243,7 +1248,7 @@ bom {
 			]
 		}
 	}
-	library("Micrometer", "1.13.2-SNAPSHOT") {
+	library("Micrometer", "1.13.2") {
 		considerSnapshots()
 		group("io.micrometer") {
 			modules = [
@@ -1262,7 +1267,7 @@ bom {
 			releaseNotes("https://github.com/micrometer-metrics/micrometer/releases/tag/v{version}")
 		}
 	}
-	library("Micrometer Tracing", "1.3.2-SNAPSHOT") {
+	library("Micrometer Tracing", "1.3.2") {
 		considerSnapshots()
 		group("io.micrometer") {
 			imports = [
@@ -1303,7 +1308,7 @@ bom {
 			releaseNotes("https://github.com/mongodb/mongo-java-driver/releases/tag/r{version}")
 		}
 	}
-	library("MSSQL JDBC", "12.6.2.jre11") {
+	library("MSSQL JDBC", "12.6.3.jre11") {
 		prohibit {
 			endsWith(".jre8")
 			because "we want to use the jre11 version"
@@ -1354,7 +1359,7 @@ bom {
 			]
 		}
 	}
-	library("Neo4j Java Driver", "5.21.0") {
+	library("Neo4j Java Driver", "5.22.0") {
 		alignWith {
 			version {
 				from "org.springframework.data:spring-data-neo4j"
@@ -1573,7 +1578,7 @@ bom {
 			]
 		}
 	}
-	library("R2DBC MariaDB", "1.2.0") {
+	library("R2DBC MariaDB", "1.2.1") {
 		group("org.mariadb") {
 			modules = [
 				"r2dbc-mariadb"
@@ -1659,7 +1664,7 @@ bom {
 			]
 		}
 	}
-	library("Reactor Bom", "2023.0.7") {
+	library("Reactor Bom", "2023.0.8") {
 		considerSnapshots()
 		calendarName = "Reactor"
 		group("io.projectreactor") {
@@ -2192,6 +2197,10 @@ bom {
 		}
 	}
 	library("Undertow", "2.3.13.Final") {
+		prohibit {
+			versionRange "[2.3.14.Final]"
+			because "it contains a regression (https://issues.redhat.com/browse/UNDERTOW-2420)"
+		}
 		group("io.undertow") {
 			modules = [
 				"undertow-core",