Skip to content

Commit 018fc57

Browse files
committed
Use spring.mavenRepositories in buildSrc for all build types
Refine `buildSrc` so that `spring.mavenRepositories()` are considered for all build types (not just milestones and snapshots). We now pass "springFrameworkVersion" to `SpringRepositorySupport.groovy` so that repo.spring.io doesn't get added for OSS builds using release artifacts. Closes gh-46823
1 parent 7f6c00d commit 018fc57

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

buildSrc/SpringRepositorySupport.groovy

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ class SpringRepositoriesExtension {
8787
addRepositories { }
8888
}
8989

90-
def mavenRepositories(condition) {
91-
if (condition) addRepositories { }
90+
def mavenRepositoriesFor(version) {
91+
addRepositories(version) { }
9292
}
9393

9494
def mavenRepositoriesExcludingBootGroup() {
@@ -100,12 +100,16 @@ class SpringRepositoriesExtension {
100100
}
101101

102102
private void addRepositories(action) {
103-
addCommercialRepository("release", false, "/spring-enterprise-maven-prod-local", action)
104-
if (this.version.contains("-")) {
103+
addRepositories(this.version, action)
104+
}
105+
106+
private void addRepositories(version, action) {
107+
addCommercialRepositoryIfNecessary("release", false, "/spring-enterprise-maven-prod-local", action)
108+
if (version.contains("-")) {
105109
addOssRepository("milestone", false, "/milestone", action)
106110
}
107-
if (this.version.endsWith("-SNAPSHOT")) {
108-
addCommercialRepository("snapshot", true, "/spring-enterprise-maven-dev-local", action)
111+
if (version.endsWith("-SNAPSHOT")) {
112+
addCommercialRepositoryIfNecessary("snapshot", true, "/spring-enterprise-maven-dev-local", action)
109113
addOssRepository("snapshot", true, "/snapshot", action)
110114
}
111115
}
@@ -116,7 +120,7 @@ class SpringRepositoriesExtension {
116120
addRepository(name, snapshot, url, action)
117121
}
118122

119-
private void addCommercialRepository(id, snapshot, path, action) {
123+
private void addCommercialRepositoryIfNecessary(id, snapshot, path, action) {
120124
if (!"commercial".equalsIgnoreCase(this.buildType)) return
121125
def name = "spring-commercial-" + id
122126
def url = fromEnv("COMMERCIAL_%SREPO_URL", id, "https://usw1.packages.broadcom.com" + path)

buildSrc/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ plugins {
2323

2424
repositories {
2525
mavenCentral()
26+
spring.mavenRepositoriesFor("${springFrameworkVersion}")
2627
gradlePluginPortal()
2728
}
2829

@@ -31,10 +32,6 @@ java {
3132
targetCompatibility = 17
3233
}
3334

34-
repositories {
35-
spring.mavenRepositories("${springFrameworkVersion}".contains("-"))
36-
}
37-
3835
checkstyle {
3936
toolVersion = "${checkstyleToolVersion}"
4037
}

0 commit comments

Comments
 (0)