Merge branch '1.0.x' into 1.1.x

micrometer-metrics · Jul 11, 2023 · ff3eb5c · ff3eb5c
2 parents dd6dba0 + 75c7b8d
commit ff3eb5c
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 40 deletions.
diff --git a/benchmarks/gradle.lockfile b/benchmarks/gradle.lockfile
diff --git a/build.gradle b/build.gradle
@@ -316,6 +316,10 @@ subprojects {
 	description = 'Facade over tracing concepts'
 
 	repositories {
+		maven {
+			url 'https://repo.spring.io/snapshot/'
+			content { includeGroup 'io.micrometer' }
+		}
 		mavenCentral()
 	}
 

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -2,7 +2,7 @@ def VERSIONS = [
 	'javax.servlet:javax.servlet-api:latest.release',
 	'jakarta.platform:jakarta.jakartaee-web-api:9.+',
 
-	'io.micrometer:context-propagation:1.0.4',
+	'io.micrometer:context-propagation:1.0.+',
 
 	'aopalliance:aopalliance:1.0',
 	'org.aspectj:aspectjweaver:1.8.+',
@@ -32,7 +32,7 @@ def VERSIONS = [
 ]
 
 def MICROMETER_PLATFORM_VERSIONS = [
-	'io.micrometer:micrometer-bom:1.11.2'
+	'io.micrometer:micrometer-bom:1.11.+'
 ]
 
 def PLATFORM_VERSIONS = [

diff --git a/micrometer-tracing-bom/gradle.lockfile b/micrometer-tracing-bom/gradle.lockfile
diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile
diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile
diff --git a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile
diff --git a/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile b/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile
diff --git a/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile b/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile
diff --git a/micrometer-tracing/gradle.lockfile b/micrometer-tracing/gradle.lockfile