Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make URL creation more robust in Bomr's version resolver

Browse Source 
Using URI#resolve is brittle as the behavior changes depending on
whether or not the URI ends with a /. This can result in the
original URI's path being lost and the URLs for the Maven metadata
files being incorrect.

See gh-42333
This commit is contained in:
Andy Wilkinson
2024-10-09 09:21:09 +01:00
parent dbc4fae9fe
commit 09400df47b
1 changed files with 5 additions and 1 deletions
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.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
/**
* 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) {
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 {
HttpHeaders headers = new HttpHeaders();
String username = repository.getCredentials().getUsername();