From 2f9138ea230d1a6136fedaf844d42aab242fcdc0 Mon Sep 17 00:00:00 2001 From: Tommy Ludwig <8924140+shakuzen@users.noreply.github.com> Date: Mon, 10 Apr 2023 22:31:56 +0900 Subject: [PATCH] Remove snapshot repo and move to Micrometer 1.10.6 Closes gh-225 --- build.gradle | 7 ------- dependencies.gradle | 2 +- micrometer-tracing-bom/gradle.lockfile | 2 +- .../gradle.lockfile | 12 ++++++------ .../micrometer-tracing-bridge-otel/gradle.lockfile | 12 ++++++------ .../gradle.lockfile | 8 ++++---- .../gradle.lockfile | 14 +++++++------- .../micrometer-tracing-test/gradle.lockfile | 8 ++++---- micrometer-tracing/gradle.lockfile | 10 +++++----- 9 files changed, 34 insertions(+), 41 deletions(-) diff --git a/build.gradle b/build.gradle index e8a82184..d3d648fa 100644 --- a/build.gradle +++ b/build.gradle @@ -303,13 +303,6 @@ subprojects { repositories { mavenCentral() - maven { - // TODO remove before releasing GA - url "https://repo.spring.io/snapshot/" - content { - includeGroup 'io.micrometer' - } - } } def check = tasks.findByName('check') diff --git a/dependencies.gradle b/dependencies.gradle index 3932998e..de042fe9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -28,7 +28,7 @@ def VERSIONS = [ ] def MICROMETER_PLATFORM_VERSIONS = [ - 'io.micrometer:micrometer-bom:1.10.6-SNAPSHOT' + 'io.micrometer:micrometer-bom:1.10.+' ] def PLATFORM_VERSIONS = [ diff --git a/micrometer-tracing-bom/gradle.lockfile b/micrometer-tracing-bom/gradle.lockfile index c5128a5d..8e534254 100644 --- a/micrometer-tracing-bom/gradle.lockfile +++ b/micrometer-tracing-bom/gradle.lockfile @@ -1,5 +1,5 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -io.micrometer:micrometer-bom:1.10.6-SNAPSHOT=classpath +io.micrometer:micrometer-bom:1.10.6=classpath empty=archives,signatures diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile index fde0caed..5bbe1510 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile @@ -26,12 +26,12 @@ commons-logging:commons-logging:1.2=nohttp info.picocli:picocli:3.9.5=nohttp-cli info.picocli:picocli:4.3.1=nohttp info.picocli:picocli:4.6.2=checkstyle -io.micrometer:context-propagation:1.0.3-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-bom:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-core:1.10.6-SNAPSHOT=testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation-test:1.10.6-SNAPSHOT=testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-bom:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-core:1.10.6=testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation-test:1.10.6=testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.19.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom:1.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-bom:2022.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile index 497641ad..e0911c74 100644 --- a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile +++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile @@ -21,12 +21,12 @@ commons-logging:commons-logging:1.2=nohttp info.picocli:picocli:3.9.5=nohttp-cli info.picocli:picocli:4.3.1=nohttp info.picocli:picocli:4.6.2=checkstyle -io.micrometer:context-propagation:1.0.3-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-bom:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-core:1.10.6-SNAPSHOT=testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation-test:1.10.6-SNAPSHOT=testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-bom:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-core:1.10.6=testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation-test:1.10.6=testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.19.2-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.19.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api-logs:1.19.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile index ca13a7ff..ab0a37f4 100644 --- a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile +++ b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile @@ -33,10 +33,10 @@ commons-logging:commons-logging:1.2=nohttp info.picocli:picocli:3.9.5=nohttp-cli info.picocli:picocli:4.3.1=nohttp info.picocli:picocli:4.6.2=checkstyle -io.micrometer:context-propagation:1.0.3-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-bom:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-bom:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.19.2-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.19.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api-logs:1.19.0-alpha=runtimeClasspath,testRuntimeClasspath diff --git a/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile b/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile index 063318e8..d6372938 100644 --- a/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile +++ b/micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile @@ -39,13 +39,13 @@ commons-logging:commons-logging:1.2=nohttp info.picocli:picocli:3.9.5=nohttp-cli info.picocli:picocli:4.3.1=nohttp info.picocli:picocli:4.6.2=checkstyle -io.micrometer:context-propagation:1.0.3-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-bom:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-core:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation-test:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-test:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-bom:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-core:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation-test:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-test:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.19.2-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:1.19.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api-logs:1.19.0-alpha=runtimeClasspath,testRuntimeClasspath diff --git a/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile b/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile index 68965c34..f7b17353 100644 --- a/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile +++ b/micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile @@ -23,10 +23,10 @@ commons-logging:commons-logging:1.2=nohttp info.picocli:picocli:3.9.5=nohttp-cli info.picocli:picocli:4.3.1=nohttp info.picocli:picocli:4.6.2=checkstyle -io.micrometer:context-propagation:1.0.3-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-bom:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-bom:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.19.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom:1.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-bom:2022.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/micrometer-tracing/gradle.lockfile b/micrometer-tracing/gradle.lockfile index 6e3e2c57..aff15f86 100644 --- a/micrometer-tracing/gradle.lockfile +++ b/micrometer-tracing/gradle.lockfile @@ -23,11 +23,11 @@ commons-logging:commons-logging:1.2=nohttp info.picocli:picocli:3.9.5=nohttp-cli info.picocli:picocli:4.3.1=nohttp info.picocli:picocli:4.6.2=checkstyle -io.micrometer:context-propagation:1.0.3-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-bom:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-core:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.10.6-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:context-propagation:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-bom:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-core:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.10.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.19.0-alpha=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-bom:1.19.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-bom:2022.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath