Merge branch '1.0.x' into 1.1.x

micrometer-metrics · Jun 9, 2023 · 5fc2292 · 5fc2292
2 parents 91a66ac + 43e0289
commit 5fc2292
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 		classpath 'com.netflix.nebula:nebula-project-plugin:10.1.2'
 		classpath 'io.spring.nohttp:nohttp-gradle:0.0.11'
 		classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
-		classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.38'
+		classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.39'
 
 		constraints {
 			classpath('org.ow2.asm:asm:7.3.1') {

diff --git a/buildscript-gradle.lockfile b/buildscript-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