Skip to content

Commit 37c074e

Browse files
Merge branch '1.8.x' into 1.9.x
# Conflicts: # benchmarks/benchmarks-core/gradle.lockfile # implementations/micrometer-registry-ganglia/gradle.lockfile # implementations/micrometer-registry-graphite/gradle.lockfile # implementations/micrometer-registry-jmx/gradle.lockfile # implementations/micrometer-registry-otlp/gradle.lockfile # implementations/micrometer-registry-prometheus/gradle.lockfile # implementations/micrometer-registry-stackdriver/gradle.lockfile # micrometer-core/gradle.lockfile # micrometer-test/gradle.lockfile # samples/micrometer-samples-boot2/gradle.lockfile # samples/micrometer-samples-core/gradle.lockfile # samples/micrometer-samples-javalin/gradle.lockfile # samples/micrometer-samples-jersey3/gradle.lockfile
2 parents ed7b419 + f2b54fe commit 37c074e

File tree

36 files changed

+241
-241
lines changed

36 files changed

+241
-241
lines changed

benchmarks/benchmarks-core/gradle.lockfile

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ buildscript {
1919
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
2020
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.4.1'
2121
classpath 'de.undercouch:gradle-download-task:5.0.2'
22-
classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.34'
22+
classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.35'
2323

2424
constraints {
2525
classpath('org.ow2.asm:asm:7.3.1') {

buildscript-gradle.lockfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

implementations/micrometer-registry-appoptics/gradle.lockfile

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

implementations/micrometer-registry-atlas/gradle.lockfile

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

implementations/micrometer-registry-azure-monitor/gradle.lockfile

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

implementations/micrometer-registry-cloudwatch/gradle.lockfile

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)