Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
8cb24a42
Commit
8cb24a42
authored
Feb 22, 2021
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include all non-snapshot repositories when checking for upgrades
Closes gh-25391
parent
a2c951d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
8 deletions
+18
-8
MavenMetadataVersionResolver.java
...ork/boot/build/bom/bomr/MavenMetadataVersionResolver.java
+5
-5
UpgradeBom.java
...a/org/springframework/boot/build/bom/bomr/UpgradeBom.java
+13
-3
No files found.
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MavenMetadataVersionResolver.java
View file @
8cb24a42
/*
* Copyright 2012-202
0
the original author or authors.
* Copyright 2012-202
1
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.
...
...
@@ -18,8 +18,8 @@ package org.springframework.boot.build.bom.bomr;
import
java.io.StringReader
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.SortedSet
;
import
java.util.TreeSet
;
...
...
@@ -49,13 +49,13 @@ final class MavenMetadataVersionResolver implements VersionResolver {
private
final
RestTemplate
rest
;
private
final
List
<
String
>
repositoryUrls
;
private
final
Collection
<
String
>
repositoryUrls
;
MavenMetadataVersionResolver
(
List
<
String
>
repositoryUrls
)
{
MavenMetadataVersionResolver
(
Collection
<
String
>
repositoryUrls
)
{
this
(
new
RestTemplate
(
Arrays
.
asList
(
new
StringHttpMessageConverter
())),
repositoryUrls
);
}
MavenMetadataVersionResolver
(
RestTemplate
restTemplate
,
List
<
String
>
repositoryUrls
)
{
MavenMetadataVersionResolver
(
RestTemplate
restTemplate
,
Collection
<
String
>
repositoryUrls
)
{
this
.
rest
=
restTemplate
;
this
.
repositoryUrls
=
repositoryUrls
;
}
...
...
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java
View file @
8cb24a42
...
...
@@ -22,16 +22,18 @@ import java.io.IOException;
import
java.io.Reader
;
import
java.nio.file.Path
;
import
java.util.ArrayList
;
import
java.util.
Arrays
;
import
java.util.
LinkedHashSet
;
import
java.util.List
;
import
java.util.Optional
;
import
java.util.Properties
;
import
java.util.Set
;
import
javax.inject.Inject
;
import
org.gradle.api.DefaultTask
;
import
org.gradle.api.InvalidUserDataException
;
import
org.gradle.api.Task
;
import
org.gradle.api.artifacts.repositories.MavenArtifactRepository
;
import
org.gradle.api.internal.tasks.userinput.UserInputHandler
;
import
org.gradle.api.tasks.Input
;
import
org.gradle.api.tasks.TaskAction
;
...
...
@@ -51,6 +53,8 @@ import org.springframework.util.StringUtils;
*/
public
class
UpgradeBom
extends
DefaultTask
{
private
Set
<
String
>
repositoryUrls
;
private
final
BomExtension
bom
;
private
String
milestone
;
...
...
@@ -58,6 +62,13 @@ public class UpgradeBom extends DefaultTask {
@Inject
public
UpgradeBom
(
BomExtension
bom
)
{
this
.
bom
=
bom
;
this
.
repositoryUrls
=
new
LinkedHashSet
<>();
getProject
().
getRepositories
().
withType
(
MavenArtifactRepository
.
class
,
(
repository
)
->
{
String
repositoryUrl
=
repository
.
getUrl
().
toString
();
if
(!
repositoryUrl
.
endsWith
(
"snapshot"
))
{
this
.
repositoryUrls
.
add
(
repository
.
getUrl
().
toString
());
}
});
}
@Option
(
option
=
"milestone"
,
description
=
"Milestone to which dependency upgrade issues should be assigned"
)
...
...
@@ -83,8 +94,7 @@ public class UpgradeBom extends DefaultTask {
"Unknown label(s): "
+
StringUtils
.
collectionToCommaDelimitedString
(
unknownLabels
));
}
Milestone
milestone
=
determineMilestone
(
repository
);
List
<
Upgrade
>
upgrades
=
new
InteractiveUpgradeResolver
(
new
MavenMetadataVersionResolver
(
Arrays
.
asList
(
"https://repo1.maven.org/maven2/"
)),
List
<
Upgrade
>
upgrades
=
new
InteractiveUpgradeResolver
(
new
MavenMetadataVersionResolver
(
this
.
repositoryUrls
),
this
.
bom
.
getUpgrade
().
getPolicy
(),
getServices
().
get
(
UserInputHandler
.
class
))
.
resolveUpgrades
(
this
.
bom
.
getLibraries
());
Path
buildFile
=
getProject
().
getBuildFile
().
toPath
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment