root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

This commit is contained in:
Andy Wilkinson 2024-10-09 09:36:01 +01:00
parent 6209aef319 7082c81167
commit 1de35dd817
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MavenMetadataVersionResolver.java
View File

@ -43,6 +43,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter;
import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
/** /**
* A {@link VersionResolver} that examines {@code maven-metadata.xml} to determine the * A {@link VersionResolver} that examines {@code maven-metadata.xml} to determine the
@ -76,7 +77,10 @@ final class MavenMetadataVersionResolver implements VersionResolver {
private Set<String> resolveVersions(String groupId, String artifactId, MavenArtifactRepository repository) { private Set<String> resolveVersions(String groupId, String artifactId, MavenArtifactRepository repository) {
Set<String> versions = new HashSet<>(); Set<String> versions = new HashSet<>();
URI url = repository.getUrl().resolve(groupId.replace('.', '/') + "/" + artifactId + "/maven-metadata.xml"); URI url = UriComponentsBuilder.fromUri(repository.getUrl())
.pathSegment(groupId.replace('.', '/'), artifactId, "maven-metadata.xml")
.build()
.toUri();
try { try {
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
String username = repository.getCredentials().getUsername(); String username = repository.getCredentials().getUsername();

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

@ -43,6 +43,7 @@ public abstract class UpgradeBom extends UpgradeDependencies {
} }
private void addOpenSourceRepositories() { private void addOpenSourceRepositories() {
getRepositoryNames().add(ArtifactRepositoryContainer.DEFAULT_MAVEN_CENTRAL_REPO_NAME);
getProject().getRepositories().withType(MavenArtifactRepository.class, (repository) -> { getProject().getRepositories().withType(MavenArtifactRepository.class, (repository) -> {
String name = repository.getName(); String name = repository.getName();
if (name.startsWith("spring-") && !name.endsWith("-snapshot")) { if (name.startsWith("spring-") && !name.endsWith("-snapshot")) {