Merge branch '1.10.x' into 1.11.x

micrometer-metrics · Jun 9, 2023 · 7d56af0 · 7d56af0
2 parents 8ae87ff + c10457a
commit 7d56af0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -402,7 +402,6 @@ subprojects {
 
     repositories {
         mavenCentral()
-        maven { url "https://repo.spring.io/snapshot" } // for context propagation snapshots
     }
 
     def check = tasks.findByName('check')

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -45,7 +45,7 @@ def VERSIONS = [
         'javax.inject:javax.inject:1',
         'javax.servlet:javax.servlet-api:latest.release',
         'javax.xml.bind:jaxb-api:2.3.+',
-        'io.micrometer:context-propagation:1.0.3-SNAPSHOT',
+        'io.micrometer:context-propagation:1.0.+',
         'org.jetbrains.kotlinx:kotlinx-coroutines-core:latest.release',
         'net.sf.ehcache:ehcache:latest.release',
         'org.apache.felix:org.apache.felix.framework:7.0.5',

diff --git a/micrometer-core/gradle.lockfile b/micrometer-core/gradle.lockfile
diff --git a/micrometer-observation/gradle.lockfile b/micrometer-observation/gradle.lockfile