Merge branch '1.9.x' into 1.10.x

jonatan-ivanov · jonatan-ivanov · commit 17ab6b5a37e7 · 2022-11-16T15:17:59.000-08:00
# Conflicts:
#	micrometer-core/build.gradle
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -75,6 +75,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
@@ -150,7 +150,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")
 
     // gRPC
     testImplementation("io.grpc:grpc-core")

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ dependencies {`
`150`	`150`	`exclude group: "org.slf4j", module: "jcl-over-slf4j"`
`151`	`151`	`}`
`152`	`152`	`testImplementation("org.apache.maven.resolver:maven-resolver-connector-basic:latest.release")`
`153`		`- testImplementation("org.springframework:spring-core:latest.release")`
	`153`	`+ testImplementation("org.springframework:spring-core")`
`154`	`154`
`155`	`155`	`// gRPC`
`156`	`156`	`testImplementation("io.grpc:grpc-core")`