From 894e0e11d43fc73b7c09e18a28e235a19fa588d1 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Tue, 11 Sep 2018 16:49:06 -0700
Subject: [PATCH] Switch from Aether to Maven Resolver

Replace Aether dependencies with Maven Resolver following the Eclipse
EOL announcement for Aether.

Closes gh-7627
---
 spring-boot-project/spring-boot-cli/pom.xml   | 136 ++++++++++--------
 ...DependencyManagementBomTransformation.java |  21 +++
 .../spring-boot-parent/pom.xml                |  89 ++++++------
 .../spring-boot-test-support/pom.xml          |  34 ++---
 4 files changed, 153 insertions(+), 127 deletions(-)

diff --git a/spring-boot-project/spring-boot-cli/pom.xml b/spring-boot-project/spring-boot-cli/pom.xml
index d5c63cd14f1..37b67de351e 100644
--- a/spring-boot-project/spring-boot-cli/pom.xml
+++ b/spring-boot-project/spring-boot-cli/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
@@ -39,6 +40,20 @@
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.sonatype.plexus</groupId>
+			<artifactId>plexus-sec-dispatcher</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.sonatype.sisu</groupId>
+			<artifactId>sisu-inject-plexus</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.sonatype.sisu</groupId>
+					<artifactId>sisu-inject-bean</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
@@ -47,53 +62,43 @@
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-crypto</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-aether-provider</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>org.eclipse.sisu.plexus</artifactId>
-					<groupId>org.eclipse.sisu</groupId>
-				</exclusion>
-			</exclusions>
+			<artifactId>maven-model</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-settings-builder</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-component-api</artifactId>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-resolver-provider</artifactId>
 			<exclusions>
 				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-api</artifactId>
+			<groupId>org.apache.maven.resolver</groupId>
+			<artifactId>maven-resolver-connector-basic</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-connector-basic</artifactId>
+			<groupId>org.apache.maven.resolver</groupId>
+			<artifactId>maven-resolver-impl</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-impl</artifactId>
+			<groupId>org.apache.maven.resolver</groupId>
+			<artifactId>maven-resolver-transport-file</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-spi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-transport-file</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-transport-http</artifactId>
+			<groupId>org.apache.maven.resolver</groupId>
+			<artifactId>maven-resolver-transport-http</artifactId>
 			<exclusions>
 				<exclusion>
 					<artifactId>jcl-over-slf4j</artifactId>
@@ -101,10 +106,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-util</artifactId>
-		</dependency>
 		<!-- Provided -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -308,17 +309,23 @@
 						<inherited>false</inherited>
 						<configuration>
 							<target>
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-								<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" />
+								<taskdef
+									resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef name="stringutil"
+									classname="ise.antelope.tasks.StringUtilTask" />
 								<var name="version-type" value="${project.version}" />
-								<propertyregex property="version-type" override="true"
-									input="${version-type}" regexp=".*\.(.*)" replace="\1" />
-								<propertyregex property="version-type" override="true"
-									input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
-								<propertyregex property="version-type" override="true"
-									input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
-								<propertyregex property="version-type" override="true"
-									input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
+								<propertyregex property="version-type"
+									override="true" input="${version-type}" regexp=".*\.(.*)"
+									replace="\1" />
+								<propertyregex property="version-type"
+									override="true" input="${version-type}" regexp="(M)\d+"
+									replace="MILESTONE" />
+								<propertyregex property="version-type"
+									override="true" input="${version-type}" regexp="(RC)\d+"
+									replace="MILESTONE" />
+								<propertyregex property="version-type"
+									override="true" input="${version-type}" regexp="BUILD-(.*)"
+									replace="SNAPSHOT" />
 								<stringutil string="${version-type}" property="repo">
 									<lowercase />
 								</stringutil>
@@ -328,12 +335,14 @@
 								<echo
 									message="Customizing homebrew for ${project.version} with checksum ${checksum} in ${repo} repo" />
 								<copy file="${basedir}/src/main/homebrew/springboot.rb"
-									tofile="${project.build.directory}/homebrew/springboot.rb" overwrite="true">
+									tofile="${project.build.directory}/homebrew/springboot.rb"
+									overwrite="true">
 									<filterchain>
 										<expandproperties />
 									</filterchain>
 								</copy>
-								<attachartifact file="${project.build.directory}/homebrew/springboot.rb"
+								<attachartifact
+									file="${project.build.directory}/homebrew/springboot.rb"
 									classifier="homebrew" type="rb" />
 							</target>
 						</configuration>
@@ -347,20 +356,27 @@
 						<inherited>false</inherited>
 						<configuration>
 							<target>
-								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-								<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" />
+								<taskdef
+									resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef name="stringutil"
+									classname="ise.antelope.tasks.StringUtilTask" />
 								<var name="scoop-version" value="${project.version}" />
-								<propertyregex property="scoop-version" override="true"
-									input="${scoop-version}" regexp="(.*)\..*" replace="\1" />
+								<propertyregex property="scoop-version"
+									override="true" input="${scoop-version}" regexp="(.*)\..*"
+									replace="\1" />
 								<var name="version-type" value="${project.version}" />
-								<propertyregex property="version-type" override="true"
-									input="${version-type}" regexp=".*\.(.*)" replace="\1" />
-								<propertyregex property="version-type" override="true"
-									input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
-								<propertyregex property="version-type" override="true"
-									input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
-								<propertyregex property="version-type" override="true"
-									input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
+								<propertyregex property="version-type"
+									override="true" input="${version-type}" regexp=".*\.(.*)"
+									replace="\1" />
+								<propertyregex property="version-type"
+									override="true" input="${version-type}" regexp="(M)\d+"
+									replace="MILESTONE" />
+								<propertyregex property="version-type"
+									override="true" input="${version-type}" regexp="(RC)\d+"
+									replace="MILESTONE" />
+								<propertyregex property="version-type"
+									override="true" input="${version-type}" regexp="BUILD-(.*)"
+									replace="SNAPSHOT" />
 								<stringutil string="${version-type}" property="repo">
 									<lowercase />
 								</stringutil>
@@ -370,7 +386,8 @@
 								<echo
 									message="Customizing scoop for ${project.version} with hash ${hash} in ${repo} repo" />
 								<copy file="${basedir}/src/main/scoop/springboot.json"
-									  tofile="${project.build.directory}/scoop/springboot.json" overwrite="true">
+									tofile="${project.build.directory}/scoop/springboot.json"
+									overwrite="true">
 									<filterchain>
 										<expandproperties>
 											<propertyset>
@@ -382,8 +399,9 @@
 										</expandproperties>
 									</filterchain>
 								</copy>
-								<attachartifact file="${project.build.directory}/scoop/springboot.json"
-												classifier="scoop" type="json" />
+								<attachartifact
+									file="${project.build.directory}/scoop/springboot.json"
+									classifier="scoop" type="json" />
 							</target>
 						</configuration>
 					</execution>
diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java
index 848478ded3d..5aca2953fcf 100644
--- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java
+++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java
@@ -28,7 +28,9 @@ import java.util.Map;
 import java.util.Set;
 
 import groovy.grape.Grape;
+import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.building.DefaultModelBuilder;
 import org.apache.maven.model.building.DefaultModelBuilderFactory;
@@ -61,6 +63,7 @@ import org.springframework.core.annotation.Order;
  * @since 1.3.0
  */
 @Order(DependencyManagementBomTransformation.ORDER)
+@SuppressWarnings("deprecation")
 public class DependencyManagementBomTransformation
 		extends AnnotatedNodeASTTransformation {
 
@@ -210,6 +213,19 @@ public class DependencyManagementBomTransformation
 
 	private static class GrapeModelResolver implements ModelResolver {
 
+		@Override
+		public ModelSource resolveModel(Parent parent) throws UnresolvableModelException {
+			return resolveModel(parent.getGroupId(), parent.getArtifactId(),
+					parent.getVersion());
+		}
+
+		@Override
+		public ModelSource resolveModel(Dependency dependency)
+				throws UnresolvableModelException {
+			return resolveModel(dependency.getGroupId(), dependency.getArtifactId(),
+					dependency.getVersion());
+		}
+
 		@Override
 		public ModelSource resolveModel(String groupId, String artifactId, String version)
 				throws UnresolvableModelException {
@@ -233,6 +249,11 @@ public class DependencyManagementBomTransformation
 				throws InvalidRepositoryException {
 		}
 
+		@Override
+		public void addRepository(Repository repository, boolean replace)
+				throws InvalidRepositoryException {
+		}
+
 		@Override
 		public ModelResolver newCopy() {
 			return this;
diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml
index 3731acabd6f..d9fb115c80b 100644
--- a/spring-boot-project/spring-boot-parent/pom.xml
+++ b/spring-boot-project/spring-boot-parent/pom.xml
@@ -23,8 +23,8 @@
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<aether.version>1.0.2.v20150114</aether.version>
-		<maven.version>3.1.1</maven.version>
+		<maven.version>3.5.4</maven.version>
+		<maven-resolver.version>1.1.1</maven-resolver.version>
 		<spock.version>1.0-groovy-2.4</spock.version>
 	</properties>
 	<scm>
@@ -78,6 +78,16 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+			<dependency>
+				<groupId>org.sonatype.plexus</groupId>
+				<artifactId>plexus-sec-dispatcher</artifactId>
+				<version>1.4</version>
+			</dependency>
+			<dependency>
+				<groupId>org.sonatype.sisu</groupId>
+				<artifactId>sisu-inject-plexus</artifactId>
+				<version>1.4.2</version>
+			</dependency>
 			<dependency>
 				<groupId>com.squareup.okhttp</groupId>
 				<artifactId>okhttp</artifactId>
@@ -128,11 +138,6 @@
 				<artifactId>ivy</artifactId>
 				<version>2.3.0</version>
 			</dependency>
-			<dependency>
-				<groupId>org.apache.maven</groupId>
-				<artifactId>maven-aether-provider</artifactId>
-				<version>3.2.1</version>
-			</dependency>
 			<dependency>
 				<groupId>org.apache.maven</groupId>
 				<artifactId>maven-archiver</artifactId>
@@ -168,6 +173,36 @@
 				<artifactId>maven-settings-builder</artifactId>
 				<version>${maven.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-model-builder</artifactId>
+				<version>${maven.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-resolver-provider</artifactId>
+				<version>${maven.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven.resolver</groupId>
+				<artifactId>maven-resolver-connector-basic</artifactId>
+				<version>${maven-resolver.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven.resolver</groupId>
+				<artifactId>maven-resolver-transport-file</artifactId>
+				<version>${maven-resolver.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven.resolver</groupId>
+				<artifactId>maven-resolver-transport-http</artifactId>
+				<version>${maven-resolver.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven.resolver</groupId>
+				<artifactId>maven-resolver-impl</artifactId>
+				<version>${maven-resolver.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.maven.shared</groupId>
 				<artifactId>maven-common-artifact-filters</artifactId>
@@ -188,51 +223,11 @@
 				<artifactId>plexus-archiver</artifactId>
 				<version>3.6.0</version>
 			</dependency>
-			<dependency>
-				<groupId>org.codehaus.plexus</groupId>
-				<artifactId>plexus-component-api</artifactId>
-				<version>1.0-alpha-33</version>
-			</dependency>
 			<dependency>
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-utils</artifactId>
 				<version>3.1.0</version>
 			</dependency>
-			<dependency>
-				<groupId>org.eclipse.aether</groupId>
-				<artifactId>aether-api</artifactId>
-				<version>${aether.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.aether</groupId>
-				<artifactId>aether-connector-basic</artifactId>
-				<version>${aether.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.aether</groupId>
-				<artifactId>aether-impl</artifactId>
-				<version>${aether.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.aether</groupId>
-				<artifactId>aether-spi</artifactId>
-				<version>${aether.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.aether</groupId>
-				<artifactId>aether-transport-file</artifactId>
-				<version>${aether.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.aether</groupId>
-				<artifactId>aether-transport-http</artifactId>
-				<version>${aether.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.aether</groupId>
-				<artifactId>aether-util</artifactId>
-				<version>${aether.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.sonatype.plexus</groupId>
 				<artifactId>plexus-build-api</artifactId>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-test-support/pom.xml
index d8140318c12..150dab46f34 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/pom.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/pom.xml
@@ -26,35 +26,27 @@
 	</build>
 	<dependencies>
 		<!-- Compile -->
+		<dependency>
+			<groupId>org.apache.maven.resolver</groupId>
+			<artifactId>maven-resolver-connector-basic</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.resolver</groupId>
+			<artifactId>maven-resolver-impl</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-aether-provider</artifactId>
+			<artifactId>maven-resolver-provider</artifactId>
 			<exclusions>
 				<exclusion>
-					<artifactId>org.eclipse.sisu.plexus</artifactId>
-					<groupId>org.eclipse.sisu</groupId>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-connector-basic</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-impl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-spi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.aether</groupId>
-			<artifactId>aether-transport-http</artifactId>
+			<groupId>org.apache.maven.resolver</groupId>
+			<artifactId>maven-resolver-transport-http</artifactId>
 			<exclusions>
 				<exclusion>
 					<artifactId>jcl-over-slf4j</artifactId>