Skip to content

Commit cc2d689

Browse files
committed
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
1 parent f19d915 commit cc2d689

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -93,7 +93,7 @@ public MavenSettings(Settings settings, SettingsDecryptionResult decryptedSettin
9393
private MirrorSelector createMirrorSelector(Settings settings) {
9494
DefaultMirrorSelector selector = new DefaultMirrorSelector();
9595
for (Mirror mirror : settings.getMirrors()) {
96-
selector.add(mirror.getId(), mirror.getUrl(), mirror.getLayout(), false, mirror.getMirrorOf(),
96+
selector.add(mirror.getId(), mirror.getUrl(), mirror.getLayout(), false, false, mirror.getMirrorOf(),
9797
mirror.getMirrorOfLayouts());
9898
}
9999
return selector;

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,16 @@ bom {
9595
]
9696
}
9797
}
98-
library("Maven Resolver", "1.6.1") {
98+
library("Maven Resolver", "1.6.3") {
9999
group("org.apache.maven.resolver") {
100100
modules = [
101+
"maven-resolver-api",
101102
"maven-resolver-connector-basic",
102103
"maven-resolver-impl",
104+
"maven-resolver-spi",
103105
"maven-resolver-transport-file",
104-
"maven-resolver-transport-http"
106+
"maven-resolver-transport-http",
107+
"maven-resolver-util"
105108
]
106109
}
107110
}

0 commit comments

Comments
 (0)