Injects Maven's repositorySystem to Aether downloader

without this change with the latest version of Maven, it is removing entries from the classpath so Aether related classes are not seen at runtime
with this change we're passing the RepositorySystem to Aether that contains all classes

fixes gh-2362

Signed-off-by: Marcin Grzejszczak <[email protected]>

Author: marcingrzejszczak

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloader.java

@@ -70,6 +70,9 @@ public class AetherStubDownloader implements StubDownloader {
 	// Preloading class for the shutdown hook not to throw ClassNotFound
 	private static final Class CLAZZ = TemporaryFileStorage.class;
 
+	// In order to allow to pass the injected values from Maven
+	private static RepositorySystem repositorySystemFromMaven;
+
 	private final List<RemoteRepository> remoteRepos;
 
 	private final RepositorySystem repositorySystem;
@@ -105,7 +108,7 @@ public AetherStubDownloader(StubRunnerOptions stubRunnerOptions) {
 				throw new UnsupportedOperationException(
 						"You can't use Aether downloader when you use classpath to find stubs");
 		}
-		this.repositorySystem = AetherFactories.repositorySystemOr(null);
+		this.repositorySystem = AetherFactories.repositorySystemOr(repositorySystemFromMaven);
 		this.workOffline = stubRunnerOptions.stubsMode == StubRunnerProperties.StubsMode.LOCAL;
 		this.session = newSession(this.repositorySystem, this.workOffline);
 		registerShutdownHook();
@@ -278,4 +281,13 @@ private void registerShutdownHook() {
 					new Thread(() -> TemporaryFileStorage.cleanup(AetherStubDownloader.this.deleteStubsAfterTest)));
 	}
 
+	/**
+	 * Use this if you're in Maven and have the {@link RepositorySystem} injected to you
+	 * through the {@code Component} annotation.
+	 * @param fromMaven system injected to you by Maven
+	 */
+	public static void setRepositorySystemFromMaven(RepositorySystem fromMaven) {
+		repositorySystemFromMaven = fromMaven;
+	}
+
 }

spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java

@@ -28,14 +28,17 @@
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
+import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
 
 import org.springframework.cloud.contract.spec.ContractVerifierException;
+import org.springframework.cloud.contract.stubrunner.AetherStubDownloader;
 import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties;
 import org.springframework.cloud.contract.verifier.TestGenerator;
 import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties;
@@ -53,6 +56,11 @@
 		requiresDependencyResolution = ResolutionScope.TEST)
 public class GenerateTestsMojo extends AbstractMojo {
 
+	@Component
+	private RepositorySystem repositorySystem;
+
+	// Required for the case where there is no configuration (check the basic project for
+	// tests)
 	@Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
 	private RepositorySystemSession repoSession;
 
@@ -263,6 +271,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 		final ContractVerifierConfigProperties config = new ContractVerifierConfigProperties();
 		config.setFailOnInProgress(this.failOnInProgress);
 		// download contracts, unzip them and pass as output directory
+		AetherStubDownloader.setRepositorySystemFromMaven(repositorySystem);
 		File contractsDirectory = new MavenContractsDownloader(this.project, this.contractDependency,
 				this.contractsPath, this.contractsRepositoryUrl, this.contractsMode, getLog(),
 				this.contractsRepositoryUsername, this.contractsRepositoryPassword, this.contractsRepositoryProxyHost,