Merge branch '1.0.x' into 1.1.x

jonatan-ivanov · jonatan-ivanov · commit 423917f26127 · 2023-10-13T14:56:25.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -298,6 +298,10 @@ subprojects {
 	description = 'Facade over tracing concepts'
 
 	repositories {
+		maven {
+			url 'https://repo.spring.io/snapshot/'
+			content { includeGroup 'io.micrometer' }
+		}
 		mavenCentral()
 	}
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
-micrometer = "1.11.5"
+micrometer = "1.11.6-SNAPSHOT"
+micrometerContextPropagation="1.0.7-SNAPSHOT"
 junit = "5.10.0"
 javaxServlet="4.0.1"
 jmh="1.37"
-micrometerContextPropagation="1.0.6"
 jakartaWeb="9.1.0"
 otelInstrumentation="1.25.1-alpha"
 aopalliance="1.0"

Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,10 @@ subprojects {`
`298`	`298`	`description = 'Facade over tracing concepts'`
`299`	`299`
`300`	`300`	`repositories {`
	`301`	`+ maven {`
	`302`	`+ url 'https://repo.spring.io/snapshot/'`
	`303`	`+ content { includeGroup 'io.micrometer' }`
	`304`	`+ }`
`301`	`305`	`mavenCentral()`
`302`	`306`	`}`
`303`	`307`