root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x 

Closes gh-31086
This commit is contained in:
Andy Wilkinson 2022-05-17 18:37:05 +01:00
parent 036356b4c6 e3b2088e85
commit 179e37279d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 {
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
View File

@ -102,13 +102,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"
]
}
}