Skip to content

Commit 9f05c95

Browse files
authored
Clean up renovate config around Spring Boot 2 package rules (#15322)
1 parent d511ebe commit 9f05c95

File tree

1 file changed

+5
-21
lines changed

1 file changed

+5
-21
lines changed

.github/renovate.json5

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,7 @@
190190
enabled: false,
191191
},
192192
{
193-
// intentionally using Spring Boot 2 in this smoke tests
194-
// new versions of Spring Boot 3 are tested with
195-
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/dc4330e0a3060bd7d8c4090ad0b8fc4727e68113/settings.gradle.kts#L43-L45
193+
// intentionally using Spring Boot 2 in these smoke tests
196194
matchFileNames: [
197195
'smoke-tests/images/spring-boot/build.gradle.kts',
198196
'smoke-tests-otel-starter/spring-boot-2/build.gradle.kts',
@@ -203,42 +201,28 @@
203201
],
204202
matchPackageNames: [
205203
'org.slf4j:slf4j-api',
206-
'org.springframework.boot:org.springframework.boot.gradle.plugin', // this is for plugin id "org.springframework.boot"
207-
'org.springframework.boot:spring-boot-dependencies',
204+
'org.springframework.boot:**',
208205
],
209206
matchUpdateTypes: [
210207
'major',
211-
'minor',
212208
],
213209
enabled: false,
214210
},
215211
{
216-
// intentionally using Spring Boot 2 in this smoke tests
212+
// intentionally using Logback 1.2 (for Spring Boot 2) in these smoke tests
217213
matchFileNames: [
214+
'smoke-tests/images/spring-boot/build.gradle.kts',
218215
'smoke-tests-otel-starter/spring-boot-2/build.gradle.kts',
219216
'smoke-tests-otel-starter/spring-boot-reactive-2/build.gradle.kts',
220217
],
221218
matchPackageNames: [
222-
'ch.qos.logback:logback-classic',
223-
],
224-
matchUpdateTypes: [
225-
'minor',
226-
],
227-
enabled: false,
228-
},
229-
{
230-
// intentionally using logback 1.2 in this smoke tests
231-
matchFileNames: [
232-
'smoke-tests/images/spring-boot/build.gradle.kts',
219+
'ch.qos.logback:**',
233220
],
234221
matchUpdateTypes: [
235222
'major',
236223
'minor',
237224
],
238225
enabled: false,
239-
matchPackageNames: [
240-
'ch.qos.logback:**',
241-
],
242226
},
243227
{
244228
// intentionally using slf4j 1 in this smoke tests

0 commit comments

Comments
 (0)