Merge branch '1.11.x' into 1.12.x

jkemming · Nov 21, 2023 · 179ae38 · 179ae38
2 parents b1106af + 870601c
commit 179ae38
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/.../src/test/java/io/micrometer/core/testsupport/classpath/ModifiedClassPathClassLoader.java b/.../src/test/java/io/micrometer/core/testsupport/classpath/ModifiedClassPathClassLoader.java
@@ -43,7 +43,6 @@
 import org.eclipse.aether.collection.CollectRequest;
 import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
 import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.impl.DefaultServiceLocator;
 import org.eclipse.aether.repository.LocalRepository;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.resolution.ArtifactResult;
@@ -232,11 +231,9 @@ private static List<URL> getAdditionalUrls(List<MergedAnnotations> annotations)
 
     private static List<URL> resolveCoordinates(String[] coordinates) {
         Exception latestFailure = null;
-        DefaultServiceLocator serviceLocator = MavenRepositorySystemUtils.newServiceLocator();
-        serviceLocator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
-        serviceLocator.addService(TransporterFactory.class, HttpTransporterFactory.class);
-        RepositorySystem repositorySystem = serviceLocator.getService(RepositorySystem.class);
+        RepositorySystem repositorySystem = createRepositorySystem();
         DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
+        session.setSystemProperties(System.getProperties());
         LocalRepository localRepository = new LocalRepository(System.getProperty("user.home") + "/.m2/repository");
         RemoteRepository remoteRepository = new RemoteRepository.Builder("central", "default",
                 "https://repo.maven.apache.org/maven2")
@@ -262,6 +259,15 @@ private static List<URL> resolveCoordinates(String[] coordinates) {
                 latestFailure);
     }
 
+    @SuppressWarnings("deprecation")
+    private static RepositorySystem createRepositorySystem() {
+        org.eclipse.aether.impl.DefaultServiceLocator serviceLocator = MavenRepositorySystemUtils.newServiceLocator();
+        serviceLocator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
+        serviceLocator.addService(TransporterFactory.class, HttpTransporterFactory.class);
+        RepositorySystem repositorySystem = serviceLocator.getService(RepositorySystem.class);
+        return repositorySystem;
+    }
+
     private static List<Dependency> createDependencies(String[] allCoordinates) {
         List<Dependency> dependencies = new ArrayList<>();
         for (String coordinate : allCoordinates) {