Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch from Aether to Maven Resolver

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

Closes gh-7627
This commit is contained in:
Phillip Webb
2018-09-11 16:49:06 -07:00
parent 1f9754fc81
commit 894e0e11d4
4 changed files with 153 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java
View File

@@ -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;