Browse Source

Upgrade to Maven Resolver 1.6.3

This commit also expands our internal dependency management for
Maven Resolver to cover all of the modules upon which we depend.

Closes gh-31083
pull/32644/head
Andy Wilkinson 4 years ago
parent
commit
cc2d68968d
  1. 4
      spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettings.java
  2. 7
      spring-boot-project/spring-boot-parent/build.gradle

4
spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettings.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -93,7 +93,7 @@ public class MavenSettings { @@ -93,7 +93,7 @@ public class MavenSettings {
private MirrorSelector createMirrorSelector(Settings settings) {
DefaultMirrorSelector selector = new DefaultMirrorSelector();
for (Mirror mirror : settings.getMirrors()) {
selector.add(mirror.getId(), mirror.getUrl(), mirror.getLayout(), false, mirror.getMirrorOf(),
selector.add(mirror.getId(), mirror.getUrl(), mirror.getLayout(), false, false, mirror.getMirrorOf(),
mirror.getMirrorOfLayouts());
}
return selector;

7
spring-boot-project/spring-boot-parent/build.gradle

@ -95,13 +95,16 @@ bom { @@ -95,13 +95,16 @@ bom {
]
}
}
library("Maven Resolver", "1.6.1") {
library("Maven Resolver", "1.6.3") {
group("org.apache.maven.resolver") {
modules = [
"maven-resolver-api",
"maven-resolver-connector-basic",
"maven-resolver-impl",
"maven-resolver-spi",
"maven-resolver-transport-file",
"maven-resolver-transport-http"
"maven-resolver-transport-http",
"maven-resolver-util"
]
}
}

Loading…
Cancel
Save