Skip to content

Commit 1ca97ea

Browse files
committed
Revert to com.gradle.enterprise:3.15.1
* Upgrade to `io.spring.ge.conventions:0.0.15` * Rearrange `imports.mavenBom` order in attempt to resolve the problem with version resolution on CI
1 parent 9889c27 commit 1ca97ea

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

build.gradle

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,15 @@ allprojects {
8989

9090
apply plugin: 'io.spring.dependency-management'
9191

92+
repositories {
93+
mavenCentral()
94+
maven { url 'https://repo.spring.io/milestone' }
95+
if (version.endsWith('SNAPSHOT')) {
96+
maven { url 'https://repo.spring.io/snapshot' }
97+
}
98+
// maven { url 'https://repository.apache.org/content/groups/staging/' }
99+
}
100+
92101
dependencyManagement {
93102
resolutionStrategy {
94103
cacheChangingModulesFor 0, 'seconds'
@@ -101,23 +110,13 @@ allprojects {
101110
imports {
102111
mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonBomVersion"
103112
mavenBom "org.junit:junit-bom:$junitJupiterVersion"
104-
mavenBom "org.springframework:spring-framework-bom:$springVersion"
105-
mavenBom "io.projectreactor:reactor-bom:$reactorVersion"
106-
mavenBom "org.springframework.data:spring-data-bom:$springDataVersion"
107113
mavenBom "io.micrometer:micrometer-bom:$micrometerVersion"
108114
mavenBom "io.micrometer:micrometer-tracing-bom:$micrometerTracingVersion"
115+
mavenBom "io.projectreactor:reactor-bom:$reactorVersion"
116+
mavenBom "org.springframework.data:spring-data-bom:$springDataVersion"
117+
mavenBom "org.springframework:spring-framework-bom:$springVersion"
109118
}
110119
}
111-
112-
repositories {
113-
mavenCentral()
114-
maven { url 'https://repo.spring.io/milestone' }
115-
if (version.endsWith('SNAPSHOT')) {
116-
maven { url 'https://repo.spring.io/snapshot' }
117-
}
118-
// maven { url 'https://repository.apache.org/content/groups/staging/' }
119-
}
120-
121120
}
122121

123122
configure(javaProjects) { subproject ->

settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id 'com.gradle.enterprise' version '3.12.6'
3-
id 'io.spring.ge.conventions' version '0.0.14'
2+
id 'com.gradle.enterprise' version '3.15.1'
3+
id 'io.spring.ge.conventions' version '0.0.15'
44
}
55

66
rootProject.name = 'spring-kafka-dist'

0 commit comments

Comments
 (0)