Skip to content

Commit 1368593

Browse files
committed
Upgrade to Maven Resolver 1.9.14
Closes gh-36751
1 parent ef79d88 commit 1368593

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ bom {
118118
]
119119
}
120120
}
121-
library("Maven Resolver", "1.6.3") {
121+
library("Maven Resolver", "1.9.14") {
122122
group("org.apache.maven.resolver") {
123123
modules = [
124124
"maven-resolver-api",

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.eclipse.aether.collection.CollectRequest;
4444
import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
4545
import org.eclipse.aether.graph.Dependency;
46-
import org.eclipse.aether.impl.DefaultServiceLocator;
4746
import org.eclipse.aether.repository.LocalRepository;
4847
import org.eclipse.aether.repository.RemoteRepository;
4948
import org.eclipse.aether.resolution.ArtifactResult;
@@ -240,11 +239,9 @@ private static List<URL> getAdditionalUrls(List<MergedAnnotations> annotations)
240239

241240
private static List<URL> resolveCoordinates(String[] coordinates) {
242241
Exception latestFailure = null;
243-
DefaultServiceLocator serviceLocator = MavenRepositorySystemUtils.newServiceLocator();
244-
serviceLocator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
245-
serviceLocator.addService(TransporterFactory.class, HttpTransporterFactory.class);
246-
RepositorySystem repositorySystem = serviceLocator.getService(RepositorySystem.class);
242+
RepositorySystem repositorySystem = createRepositorySystem();
247243
DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
244+
session.setSystemProperties(System.getProperties());
248245
LocalRepository localRepository = new LocalRepository(System.getProperty("user.home") + "/.m2/repository");
249246
RemoteRepository remoteRepository = new RemoteRepository.Builder("central", "default",
250247
"https://repo.maven.apache.org/maven2")
@@ -270,6 +267,15 @@ private static List<URL> resolveCoordinates(String[] coordinates) {
270267
latestFailure);
271268
}
272269

270+
@SuppressWarnings("deprecation")
271+
private static RepositorySystem createRepositorySystem() {
272+
org.eclipse.aether.impl.DefaultServiceLocator serviceLocator = MavenRepositorySystemUtils.newServiceLocator();
273+
serviceLocator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
274+
serviceLocator.addService(TransporterFactory.class, HttpTransporterFactory.class);
275+
RepositorySystem repositorySystem = serviceLocator.getService(RepositorySystem.class);
276+
return repositorySystem;
277+
}
278+
273279
private static List<Dependency> createDependencies(String[] allCoordinates) {
274280
List<Dependency> dependencies = new ArrayList<>();
275281
for (String coordinate : allCoordinates) {

0 commit comments

Comments
 (0)