Merge branch '3.2.x' into 3.3.x

Author: philwebb

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

@@ -17,14 +17,14 @@
 package org.springframework.boot.build.bom.bomr;
 
 import java.time.OffsetDateTime;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiPredicate;
 
 import javax.inject.Inject;
 
 import org.gradle.api.Task;
+import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 import org.gradle.api.tasks.TaskAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,9 +35,6 @@
 import org.springframework.boot.build.bom.bomr.github.Milestone;
 import org.springframework.boot.build.bom.bomr.version.DependencyVersion;
 import org.springframework.boot.build.properties.BuildProperties;
-import org.springframework.boot.build.properties.BuildType;
-import org.springframework.boot.build.repository.SpringRepository;
-import org.springframework.boot.build.repository.SpringRepository.RepositoryType;
 
 /**
  * A {@link Task} to move to snapshot dependencies.
@@ -51,17 +48,12 @@ public abstract class MoveToSnapshots extends UpgradeDependencies {
 	@Inject
 	public MoveToSnapshots(BomExtension bom) {
 		super(bom, true);
-		BuildType buildType = BuildProperties.get(this).buildType();
-		getRepositoryNames().addAll(getSnapshotRepositoryNames(buildType));
-	}
-
-	public static List<String> getSnapshotRepositoryNames(BuildType buildType) {
-		return Arrays.stream(SpringRepository.values())
-			.filter((repository) -> repository.getRepositoryType() == RepositoryType.SNAPSHOT)
-			.filter((repository) -> repository.getBuildType() == BuildType.OPEN_SOURCE
-					|| repository.getBuildType() == buildType)
-			.map(SpringRepository::getName)
-			.toList();
+		getProject().getRepositories().withType(MavenArtifactRepository.class, (repository) -> {
+			String name = repository.getName();
+			if (name.startsWith("spring-") && name.endsWith("-snapshot")) {
+				getRepositoryNames().add(name);
+			}
+		});
 	}
 
 	@Override
@@ -95,7 +87,7 @@ protected boolean eligible(Library library) {
 
 	@Override
 	protected List<BiPredicate<Library, DependencyVersion>> determineUpdatePredicates(Milestone milestone) {
-		return switch (BuildProperties.get(this).buildType()) {
+		return switch (BuildProperties.get(getProject()).buildType()) {
 			case OPEN_SOURCE -> determineOpenSourceUpdatePredicates(milestone);
 			case COMMERCIAL -> super.determineUpdatePredicates(milestone);
 		};

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

@@ -24,7 +24,6 @@
 
 import org.springframework.boot.build.bom.BomExtension;
 import org.springframework.boot.build.properties.BuildProperties;
-import org.springframework.boot.build.repository.SpringRepository;
 
 /**
  * {@link Task} to upgrade the libraries managed by a bom.
@@ -37,27 +36,24 @@ public abstract class UpgradeBom extends UpgradeDependencies {
 	@Inject
 	public UpgradeBom(BomExtension bom) {
 		super(bom);
-		switch (BuildProperties.get(this).buildType()) {
+		switch (BuildProperties.get(getProject()).buildType()) {
 			case OPEN_SOURCE -> addOpenSourceRepositories();
 			case COMMERCIAL -> addCommercialRepositories();
 		}
 	}
 
 	private void addOpenSourceRepositories() {
 		getProject().getRepositories().withType(MavenArtifactRepository.class, (repository) -> {
-			if (!isSnaphotRepository(repository)) {
-				getRepositoryNames().add(repository.getName());
+			String name = repository.getName();
+			if (name.startsWith("spring-") && !name.endsWith("-snapshot")) {
+				getRepositoryNames().add(name);
 			}
 		});
 	}
 
 	private void addCommercialRepositories() {
 		getRepositoryNames().addAll(ArtifactRepositoryContainer.DEFAULT_MAVEN_CENTRAL_REPO_NAME,
-				SpringRepository.COMMERCIAL_RELEASE.getName());
-	}
-
-	private boolean isSnaphotRepository(MavenArtifactRepository repository) {
-		return repository.getUrl().toString().endsWith("snapshot");
+				"spring-commerical-release");
 	}
 
 	@Override

buildSrc/src/main/java/org/springframework/boot/build/properties/BuildProperties.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.build.properties;
 
 import org.gradle.api.Project;
-import org.gradle.api.Task;
 
 /**
  * Properties that can influence the build.
@@ -30,15 +29,6 @@ public record BuildProperties(BuildType buildType, GitHub gitHub) {
 
 	private static final String PROPERTY_NAME = BuildProperties.class.getName();
 
-	/**
-	 * Get the {@link BuildProperties} for the given {@link Task}.
-	 * @param task the source task
-	 * @return the build properties
-	 */
-	public static BuildProperties get(Task task) {
-		return get(task.getProject());
-	}
-
 	/**
 	 * Get the {@link BuildProperties} for the given {@link Project}.
 	 * @param project the source project