Skip to content

Commit 4e02c43

Browse files
committed
Update BOMR to use repository names rather than SpringRepository
Update BOMR to use repositories names so that we can delete the `SpringRepository` logic. See gh-42333
1 parent bc046ba commit 4e02c43

File tree

5 files changed

+13
-177
lines changed

5 files changed

+13
-177
lines changed

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
package org.springframework.boot.build.bom.bomr;
1818

1919
import java.time.OffsetDateTime;
20-
import java.util.Arrays;
2120
import java.util.List;
2221
import java.util.Map;
2322
import java.util.function.BiPredicate;
2423

2524
import javax.inject.Inject;
2625

2726
import org.gradle.api.Task;
27+
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
2828
import org.gradle.api.tasks.TaskAction;
2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;
@@ -35,9 +35,6 @@
3535
import org.springframework.boot.build.bom.bomr.github.Milestone;
3636
import org.springframework.boot.build.bom.bomr.version.DependencyVersion;
3737
import org.springframework.boot.build.properties.BuildProperties;
38-
import org.springframework.boot.build.properties.BuildType;
39-
import org.springframework.boot.build.repository.SpringRepository;
40-
import org.springframework.boot.build.repository.SpringRepository.RepositoryType;
4138

4239
/**
4340
* A {@link Task} to move to snapshot dependencies.
@@ -51,17 +48,12 @@ public abstract class MoveToSnapshots extends UpgradeDependencies {
5148
@Inject
5249
public MoveToSnapshots(BomExtension bom) {
5350
super(bom, true);
54-
BuildType buildType = BuildProperties.get(this).buildType();
55-
getRepositoryNames().addAll(getSnapshotRepositoryNames(buildType));
56-
}
57-
58-
public static List<String> getSnapshotRepositoryNames(BuildType buildType) {
59-
return Arrays.stream(SpringRepository.values())
60-
.filter((repository) -> repository.getRepositoryType() == RepositoryType.SNAPSHOT)
61-
.filter((repository) -> repository.getBuildType() == BuildType.OPEN_SOURCE
62-
|| repository.getBuildType() == buildType)
63-
.map(SpringRepository::getName)
64-
.toList();
51+
getProject().getRepositories().withType(MavenArtifactRepository.class, (repository) -> {
52+
String name = repository.getName();
53+
if (name.startsWith("spring-") && name.endsWith("-snapshot")) {
54+
getRepositoryNames().add(name);
55+
}
56+
});
6557
}
6658

6759
@Override
@@ -95,7 +87,7 @@ protected boolean eligible(Library library) {
9587

9688
@Override
9789
protected List<BiPredicate<Library, DependencyVersion>> determineUpdatePredicates(Milestone milestone) {
98-
return switch (BuildProperties.get(this).buildType()) {
90+
return switch (BuildProperties.get(getProject()).buildType()) {
9991
case OPEN_SOURCE -> determineOpenSourceUpdatePredicates(milestone);
10092
case COMMERCIAL -> super.determineUpdatePredicates(milestone);
10193
};

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import org.springframework.boot.build.bom.BomExtension;
2626
import org.springframework.boot.build.properties.BuildProperties;
27-
import org.springframework.boot.build.repository.SpringRepository;
2827

2928
/**
3029
* {@link Task} to upgrade the libraries managed by a bom.
@@ -37,27 +36,24 @@ public abstract class UpgradeBom extends UpgradeDependencies {
3736
@Inject
3837
public UpgradeBom(BomExtension bom) {
3938
super(bom);
40-
switch (BuildProperties.get(this).buildType()) {
39+
switch (BuildProperties.get(getProject()).buildType()) {
4140
case OPEN_SOURCE -> addOpenSourceRepositories();
4241
case COMMERCIAL -> addCommercialRepositories();
4342
}
4443
}
4544

4645
private void addOpenSourceRepositories() {
4746
getProject().getRepositories().withType(MavenArtifactRepository.class, (repository) -> {
48-
if (!isSnaphotRepository(repository)) {
49-
getRepositoryNames().add(repository.getName());
47+
String name = repository.getName();
48+
if (name.startsWith("spring-") && !name.endsWith("-snapshot")) {
49+
getRepositoryNames().add(name);
5050
}
5151
});
5252
}
5353

5454
private void addCommercialRepositories() {
5555
getRepositoryNames().addAll(ArtifactRepositoryContainer.DEFAULT_MAVEN_CENTRAL_REPO_NAME,
56-
SpringRepository.COMMERCIAL_RELEASE.getName());
57-
}
58-
59-
private boolean isSnaphotRepository(MavenArtifactRepository repository) {
60-
return repository.getUrl().toString().endsWith("snapshot");
56+
"spring-commerical-release");
6157
}
6258

6359
@Override

buildSrc/src/main/java/org/springframework/boot/build/properties/BuildProperties.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.springframework.boot.build.properties;
1818

1919
import org.gradle.api.Project;
20-
import org.gradle.api.Task;
2120

2221
/**
2322
* Properties that can influence the build.
@@ -30,15 +29,6 @@ public record BuildProperties(BuildType buildType, GitHub gitHub) {
3029

3130
private static final String PROPERTY_NAME = BuildProperties.class.getName();
3231

33-
/**
34-
* Get the {@link BuildProperties} for the given {@link Task}.
35-
* @param task the source task
36-
* @return the build properties
37-
*/
38-
public static BuildProperties get(Task task) {
39-
return get(task.getProject());
40-
}
41-
4232
/**
4333
* Get the {@link BuildProperties} for the given {@link Project}.
4434
* @param project the source project

buildSrc/src/main/java/org/springframework/boot/build/repository/RepositoryUrl.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

buildSrc/src/main/java/org/springframework/boot/build/repository/SpringRepository.java

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)