From dfd4287c09863a5f0c959bd4d147fd07fc0f506a Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Mon, 14 Aug 2023 16:00:48 -0700 Subject: [PATCH] Go back to context propagation snapshot This reverts commit 8c8daa993a6ade7e3f01c8f20f10c7da34fbc17d. --- build.gradle | 8 ++++---- dependencies.gradle | 2 +- micrometer-core/gradle.lockfile | 2 +- micrometer-observation/gradle.lockfile | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 6a8db1c94c..38d6343e32 100644 --- a/build.gradle +++ b/build.gradle @@ -390,10 +390,10 @@ subprojects { description = 'Application monitoring instrumentation facade' repositories { - // maven { - // url 'https://repo.spring.io/snapshot/' - // content { includeGroup 'io.micrometer' } - // } + maven { + url 'https://repo.spring.io/snapshot/' + content { includeGroup 'io.micrometer' } + } mavenCentral() } diff --git a/dependencies.gradle b/dependencies.gradle index 4241c9c0c8..ccf39ba34b 100644 --- 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.5', + 'io.micrometer:context-propagation:1.0.+', 'org.jetbrains.kotlinx:kotlinx-coroutines-core:latest.release', 'net.sf.ehcache:ehcache:latest.release', 'org.apache.httpcomponents:httpasyncclient:latest.release', diff --git a/micrometer-core/gradle.lockfile b/micrometer-core/gradle.lockfile index 54d93f1010..fb0f3bdeb8 100644 --- a/micrometer-core/gradle.lockfile +++ b/micrometer-core/gradle.lockfile @@ -115,7 +115,7 @@ io.grpc:grpc-protobuf-lite:1.49.2=java11TestCompileClasspath,java11TestImplement io.grpc:grpc-protobuf:1.49.2=java11TestCompileClasspath,java11TestImplementationDependenciesMetadata,java11TestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath io.grpc:grpc-stub:1.49.2=java11TestCompileClasspath,java11TestImplementationDependenciesMetadata,java11TestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath io.grpc:grpc-testing-proto:1.49.2=java11TestCompileClasspath,java11TestImplementationDependenciesMetadata,java11TestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -io.micrometer:context-propagation:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.5-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-bom:4.1.96.Final=apiDependenciesMetadata,compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,java11ApiDependenciesMetadata,java11CompileClasspath,java11ImplementationDependenciesMetadata,java11RuntimeClasspath,java11TestCompileClasspath,java11TestImplementationDependenciesMetadata,java11TestRuntimeClasspath,runtimeClasspath,runtimeOnlyDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata io.perfmark:perfmark-api:0.25.0=java11TestRuntimeClasspath,testRuntimeClasspath io.projectreactor:reactor-bom:2020.0.34=apiDependenciesMetadata,compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,java11ApiDependenciesMetadata,java11CompileClasspath,java11ImplementationDependenciesMetadata,java11RuntimeClasspath,java11TestCompileClasspath,java11TestImplementationDependenciesMetadata,java11TestRuntimeClasspath,runtimeClasspath,runtimeOnlyDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata diff --git a/micrometer-observation/gradle.lockfile b/micrometer-observation/gradle.lockfile index 34978bd7ad..01918e467a 100644 --- a/micrometer-observation/gradle.lockfile +++ b/micrometer-observation/gradle.lockfile @@ -59,7 +59,7 @@ info.picocli:picocli:4.6.2=checkstyle info.picocli:picocli:4.6.3=spotless-1972451482,spotless-1972451484 io.github.detekt.sarif4k:sarif4k:0.2.0=spotless-1972451482,spotless-1972451484 io.github.microutils:kotlin-logging-jvm:2.1.23=spotless-1972451482,spotless-1972451484 -io.micrometer:context-propagation:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.5-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-bom:4.1.96.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-bom:2020.0.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.spring.javaformat:spring-javaformat-checkstyle:0.0.39=checkstyle