Skip to content

Commit 5d11cb6

Browse files
author
Dave Syer
committed
Change priority of repository declarations
1 parent 87fea9b commit 5d11cb6

File tree

1 file changed

+3
-18
lines changed

1 file changed

+3
-18
lines changed

launcher/src/main/java/org/springframework/boot/loader/thin/DependencyResolver.java

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,6 @@ private ProjectBuildingRequest getProjectBuildingRequest(Properties properties)
298298
DefaultRepositorySystemSession session = createSession(properties);
299299
projectBuildingRequest.setRepositoryMerging(RepositoryMerging.REQUEST_DOMINANT);
300300
projectBuildingRequest.setRemoteRepositories(mavenRepositories(settings, session, properties));
301-
projectBuildingRequest.setRemoteRepositories(
302-
mavenRepositories(settings, session, projectBuildingRequest.getRemoteRepositories()));
303301
projectBuildingRequest.setLocalRepository(localArtifactRepository(properties, settings, session, true));
304302
projectBuildingRequest.setRepositorySession(session);
305303
projectBuildingRequest.setProcessPlugins(false);
@@ -322,36 +320,23 @@ private ProjectBuildingRequest getProjectBuildingRequest(Properties properties)
322320
return projectBuildingRequest;
323321
}
324322

325-
private List<ArtifactRepository> mavenRepositories(MavenSettings settings, DefaultRepositorySystemSession session,
326-
List<ArtifactRepository> repositories) {
327-
List<ArtifactRepository> list = new ArrayList<>(repositories);
328-
for (Profile profile : settings.getActiveProfiles()) {
329-
for (Repository repository : profile.getRepositories()) {
330-
addRepositoryIfMissing(settings, session, list, repository.getId(), repository.getUrl(),
331-
repository.getReleases() != null ? repository.getReleases().isEnabled() : true,
332-
repository.getSnapshots() != null ? repository.getSnapshots().isEnabled() : true);
333-
}
334-
}
335-
return list;
336-
}
337-
338323
private List<ArtifactRepository> mavenRepositories(MavenSettings settings, RepositorySystemSession session,
339324
Properties properties) {
340325
List<ArtifactRepository> list = new ArrayList<>();
341326
if (properties.containsKey(ThinJarLauncher.THIN_ROOT)) {
342327
addRepositoryIfMissing(settings, session, list, "local",
343328
"file://" + localRepositoryPath(new Properties(), settings, false), true, true);
344329
}
345-
addRepositoryIfMissing(settings, session, list, "spring-snapshots", "https://repo.spring.io/libs-snapshot",
346-
true, true);
347-
addRepositoryIfMissing(settings, session, list, "central", "https://repo1.maven.org/maven2", true, false);
348330
for (Profile profile : settings.getActiveProfiles()) {
349331
for (Repository repository : profile.getRepositories()) {
350332
addRepositoryIfMissing(settings, session, list, repository.getId(), repository.getUrl(),
351333
repository.getReleases() != null ? repository.getReleases().isEnabled() : true,
352334
repository.getSnapshots() != null ? repository.getSnapshots().isEnabled() : true);
353335
}
354336
}
337+
addRepositoryIfMissing(settings, session, list, "spring-snapshots", "https://repo.spring.io/libs-snapshot",
338+
true, true);
339+
addRepositoryIfMissing(settings, session, list, "central", "https://repo1.maven.org/maven2", true, false);
355340
return list;
356341
}
357342

0 commit comments

Comments
 (0)