Merge branch '2.7.x' into 3.0.x

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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.

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/ReleaseSchedule.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2023 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.

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/StandardLibraryUpdateResolver.java

@@ -51,16 +51,8 @@ class StandardLibraryUpdateResolver implements LibraryUpdateResolver {
 	StandardLibraryUpdateResolver(VersionResolver versionResolver,
 			List<BiPredicate<Library, DependencyVersion>> predicates) {
 		this.versionResolver = versionResolver;
-		BiPredicate<Library, DependencyVersion> predicate = null;
+		this.predicate = (library, dependencyVersion) -> predicates.stream()
-		for (BiPredicate<Library, DependencyVersion> p : predicates) {
+			.allMatch((predicate) -> predicate.test(library, dependencyVersion));
-			if (predicate == null) {
-				predicate = p;
-			}
-			else {
-				predicate = predicate.and(p);
-			}
-		}
-		this.predicate = predicate;
 	}
 
 	@Override

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeDependencies.java

@@ -34,6 +34,7 @@ import java.util.regex.Pattern;
 import javax.inject.Inject;
 
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.apache.maven.artifact.versioning.VersionRange;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.internal.tasks.userinput.UserInputHandler;
@@ -227,40 +228,35 @@ public abstract class UpgradeDependencies extends DefaultTask {
 	}
 
 	protected List<BiPredicate<Library, DependencyVersion>> determineUpdatePredicates(Milestone milestone) {
-		BiPredicate<Library, DependencyVersion> compilesWithUpgradePolicy = (library,
+		List<BiPredicate<Library, DependencyVersion>> updatePredicates = new ArrayList<>();
-				candidate) -> this.bom.getUpgrade().getPolicy().test(candidate, library.getVersion().getVersion());
+		updatePredicates.add(this::compilesWithUpgradePolicy);
-		BiPredicate<Library, DependencyVersion> isAnUpgrade = (library,
+		updatePredicates.add(this::isAnUpgrade);
-				candidate) -> library.getVersion().getVersion().isUpgrade(candidate, this.movingToSnapshots);
+		updatePredicates.add(this::isNotProhibited);
-		BiPredicate<Library, DependencyVersion> isPermitted = (library, candidate) -> {
+		return updatePredicates;
-			for (ProhibitedVersion prohibitedVersion : library.getProhibitedVersions()) {
-				String candidateString = candidate.toString();
-				if (prohibitedVersion.getRange() != null
-						&& prohibitedVersion.getRange().containsVersion(new DefaultArtifactVersion(candidateString))) {
-					return false;
-				}
-				for (String startsWith : prohibitedVersion.getStartsWith()) {
-					if (candidateString.startsWith(startsWith)) {
-						return false;
-					}
-				}
-				for (String endsWith : prohibitedVersion.getEndsWith()) {
-					if (candidateString.endsWith(endsWith)) {
-						return false;
-					}
 	}
-				for (String contains : prohibitedVersion.getContains()) {
+
-					if (candidateString.contains(contains)) {
+	private boolean compilesWithUpgradePolicy(Library library, DependencyVersion candidate) {
-						return false;
+		return this.bom.getUpgrade().getPolicy().test(candidate, library.getVersion().getVersion());
 	}
+
+	private boolean isAnUpgrade(Library library, DependencyVersion candidate) {
+		return library.getVersion().getVersion().isUpgrade(candidate, this.movingToSnapshots);
 	}
+
+	private boolean isNotProhibited(Library library, DependencyVersion candidate) {
+		return !library.getProhibitedVersions()
+			.stream()
+			.anyMatch((prohibited) -> isProhibited(prohibited, candidate.toString()));
 	}
-			return true;
+
-		};
+	private boolean isProhibited(ProhibitedVersion prohibited, String candidate) {
-		List<BiPredicate<Library, DependencyVersion>> updatePredicates = new ArrayList<>();
+		boolean result = false;
-		updatePredicates.add(compilesWithUpgradePolicy);
+		VersionRange range = prohibited.getRange();
-		updatePredicates.add(isAnUpgrade);
+		result = result || (range != null && range.containsVersion(new DefaultArtifactVersion(candidate)));
-		updatePredicates.add(isPermitted);
+		result = result || prohibited.getStartsWith().stream().anyMatch(candidate::startsWith);
-		return updatePredicates;
+		result = result || prohibited.getStartsWith().stream().anyMatch(candidate::endsWith);
+		result = result || prohibited.getStartsWith().stream().anyMatch(candidate::contains);
+		return result;
 	}
 
 	private List<Library> matchingLibraries() {

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/github/Milestone.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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.

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/AbstractDependencyVersion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/CalendarVersionDependencyVersion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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.

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/UnstructuredDependencyVersion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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.

buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/ReleaseScheduleTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2023 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.

buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/CalendarVersionDependencyVersionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2023 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.

buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/DependencyVersionUpgradeTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2023 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-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/NettyWebServerFactoryCustomizerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2023 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-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/socket/DomainSocket.java

@@ -74,7 +74,7 @@ public abstract class DomainSocket extends AbstractSocket {
 			return new FileDescriptor(handle, this::close);
 		}
 		catch (RuntimeException ex) {
-			this.close(handle);
+			close(handle);
 			throw ex;
 		}
 	}