Skip to content

Commit 870601c

Browse files
authored
Sync ModifiedClassPathClassLoader from Spring Boot (#4402)
See spring-projects/spring-boot@1368593
1 parent 124ef7d commit 870601c

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

micrometer-core/src/test/java/io/micrometer/core/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;
@@ -232,11 +231,9 @@ private static List<URL> getAdditionalUrls(List<MergedAnnotations> annotations)
232231

233232
private static List<URL> resolveCoordinates(String[] coordinates) {
234233
Exception latestFailure = null;
235-
DefaultServiceLocator serviceLocator = MavenRepositorySystemUtils.newServiceLocator();
236-
serviceLocator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
237-
serviceLocator.addService(TransporterFactory.class, HttpTransporterFactory.class);
238-
RepositorySystem repositorySystem = serviceLocator.getService(RepositorySystem.class);
234+
RepositorySystem repositorySystem = createRepositorySystem();
239235
DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
236+
session.setSystemProperties(System.getProperties());
240237
LocalRepository localRepository = new LocalRepository(System.getProperty("user.home") + "/.m2/repository");
241238
RemoteRepository remoteRepository = new RemoteRepository.Builder("central", "default",
242239
"https://repo.maven.apache.org/maven2")
@@ -262,6 +259,15 @@ private static List<URL> resolveCoordinates(String[] coordinates) {
262259
latestFailure);
263260
}
264261

262+
@SuppressWarnings("deprecation")
263+
private static RepositorySystem createRepositorySystem() {
264+
org.eclipse.aether.impl.DefaultServiceLocator serviceLocator = MavenRepositorySystemUtils.newServiceLocator();
265+
serviceLocator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
266+
serviceLocator.addService(TransporterFactory.class, HttpTransporterFactory.class);
267+
RepositorySystem repositorySystem = serviceLocator.getService(RepositorySystem.class);
268+
return repositorySystem;
269+
}
270+
265271
private static List<Dependency> createDependencies(String[] allCoordinates) {
266272
List<Dependency> dependencies = new ArrayList<>();
267273
for (String coordinate : allCoordinates) {

0 commit comments

Comments
 (0)