Merge branch '1.9.x' into 1.10.x

# Conflicts: # micrometer-core/build.gradle
micrometer-metrics · Nov 16, 2022 · 17ab6b5 · 17ab6b5
2 parents b6be65c + 95fff22
commit 17ab6b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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")