Merge branch '1.8.x' into 1.9.x

jonatan-ivanov · jonatan-ivanov · commit 95fff2270916 · 2022-11-16T15:15:05.000-08:00
# Conflicts:
#	dependencies.gradle
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -72,6 +72,7 @@ def VERSIONS = [
         'org.postgresql:postgresql:latest.release',
         'org.slf4j:slf4j-api:1.7.+',
         'org.springframework:spring-context:5.+',
+        'org.springframework:spring-core:5+',
         'org.testcontainers:junit-jupiter:latest.release',
         'org.testcontainers:kafka:latest.release',
         'org.testcontainers:postgresql:latest.release',
diff --git a/micrometer-core/build.gradle b/micrometer-core/build.gradle
@@ -111,7 +111,7 @@ dependencies {
         exclude group: "org.slf4j", module: "jcl-over-slf4j"
     }
     testImplementation("org.apache.maven.resolver:maven-resolver-connector-basic:latest.release")
-    testImplementation("org.springframework:spring-core:latest.release")
+    testImplementation("org.springframework:spring-core")
 }
 
 task shenandoahTest(type: Test) {

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ dependencies {`
`111`	`111`	`exclude group: "org.slf4j", module: "jcl-over-slf4j"`
`112`	`112`	`}`
`113`	`113`	`testImplementation("org.apache.maven.resolver:maven-resolver-connector-basic:latest.release")`
`114`		`- testImplementation("org.springframework:spring-core:latest.release")`
	`114`	`+ testImplementation("org.springframework:spring-core")`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`task shenandoahTest(type: Test) {`