Skip to content

Commit d2ff063

Browse files
Merge branch '1.9.x'
# Conflicts: # benchmarks/benchmarks-core/gradle.lockfile # build.gradle # implementations/micrometer-registry-appoptics/gradle.lockfile # implementations/micrometer-registry-atlas/gradle.lockfile # implementations/micrometer-registry-azure-monitor/gradle.lockfile # implementations/micrometer-registry-cloudwatch/gradle.lockfile # implementations/micrometer-registry-cloudwatch2/gradle.lockfile # implementations/micrometer-registry-datadog/gradle.lockfile # implementations/micrometer-registry-dynatrace/gradle.lockfile # implementations/micrometer-registry-elastic/gradle.lockfile # implementations/micrometer-registry-ganglia/gradle.lockfile # implementations/micrometer-registry-graphite/gradle.lockfile # implementations/micrometer-registry-health/gradle.lockfile # implementations/micrometer-registry-humio/gradle.lockfile # implementations/micrometer-registry-influx/gradle.lockfile # implementations/micrometer-registry-jmx/gradle.lockfile # implementations/micrometer-registry-kairos/gradle.lockfile # implementations/micrometer-registry-new-relic/gradle.lockfile # implementations/micrometer-registry-opentsdb/gradle.lockfile # implementations/micrometer-registry-otlp/gradle.lockfile # implementations/micrometer-registry-prometheus/gradle.lockfile # implementations/micrometer-registry-signalfx/gradle.lockfile # implementations/micrometer-registry-stackdriver/gradle.lockfile # implementations/micrometer-registry-statsd/gradle.lockfile # implementations/micrometer-registry-wavefront/gradle.lockfile # micrometer-core/gradle.lockfile # micrometer-test/gradle.lockfile # samples/micrometer-samples-boot2-reactive/gradle.lockfile # samples/micrometer-samples-boot2/gradle.lockfile # samples/micrometer-samples-core/gradle.lockfile # samples/micrometer-samples-hazelcast/gradle.lockfile # samples/micrometer-samples-hazelcast3/gradle.lockfile # samples/micrometer-samples-javalin/gradle.lockfile # samples/micrometer-samples-jersey3/gradle.lockfile # samples/micrometer-samples-spring-integration/gradle.lockfile
2 parents 4d387d4 + 37c074e commit d2ff063

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ buildscript {
2121
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
2222
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.4.1'
2323
classpath 'de.undercouch:gradle-download-task:5.0.2'
24-
classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.34'
24+
classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.35'
2525
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.10.0'
2626

2727
constraints {

buildscript-gradle.lockfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)