Merge branch '1.6.x' into 1.7.x

# Conflicts: # benchmarks/benchmarks-core/gradle.lockfile # 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-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-jersey2/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-spring-integration/gradle.lockfile
tmarszal · Aug 26, 2021 · 34c2e62 · 34c2e62
2 parents 07a65b8 + 4f950be
commit 34c2e62
Show file tree

Hide file tree

Showing 35 changed files with 103 additions and 103 deletions.
diff --git a/benchmarks/benchmarks-core/gradle.lockfile b/benchmarks/benchmarks-core/gradle.lockfile
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         classpath 'com.netflix.nebula:nebula-release-plugin:15.3.1'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:17.3.2'
         classpath 'com.netflix.nebula:nebula-project-plugin:8.1.0'
-        classpath 'io.spring.nohttp:nohttp-gradle:0.0.8'
+        classpath 'io.spring.nohttp:nohttp-gradle:0.0.9'
         classpath 'org.gradle:test-retry-gradle-plugin:1.3.1'
         classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
 

diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
diff --git a/implementations/micrometer-registry-appoptics/gradle.lockfile b/implementations/micrometer-registry-appoptics/gradle.lockfile
diff --git a/implementations/micrometer-registry-atlas/gradle.lockfile b/implementations/micrometer-registry-atlas/gradle.lockfile
diff --git a/implementations/micrometer-registry-azure-monitor/gradle.lockfile b/implementations/micrometer-registry-azure-monitor/gradle.lockfile
diff --git a/implementations/micrometer-registry-cloudwatch/gradle.lockfile b/implementations/micrometer-registry-cloudwatch/gradle.lockfile
diff --git a/implementations/micrometer-registry-cloudwatch2/gradle.lockfile b/implementations/micrometer-registry-cloudwatch2/gradle.lockfile
diff --git a/implementations/micrometer-registry-datadog/gradle.lockfile b/implementations/micrometer-registry-datadog/gradle.lockfile
diff --git a/implementations/micrometer-registry-dynatrace/gradle.lockfile b/implementations/micrometer-registry-dynatrace/gradle.lockfile
diff --git a/implementations/micrometer-registry-elastic/gradle.lockfile b/implementations/micrometer-registry-elastic/gradle.lockfile
diff --git a/implementations/micrometer-registry-ganglia/gradle.lockfile b/implementations/micrometer-registry-ganglia/gradle.lockfile
diff --git a/implementations/micrometer-registry-graphite/gradle.lockfile b/implementations/micrometer-registry-graphite/gradle.lockfile
diff --git a/implementations/micrometer-registry-health/gradle.lockfile b/implementations/micrometer-registry-health/gradle.lockfile
diff --git a/implementations/micrometer-registry-humio/gradle.lockfile b/implementations/micrometer-registry-humio/gradle.lockfile
diff --git a/implementations/micrometer-registry-influx/gradle.lockfile b/implementations/micrometer-registry-influx/gradle.lockfile
diff --git a/implementations/micrometer-registry-jmx/gradle.lockfile b/implementations/micrometer-registry-jmx/gradle.lockfile
diff --git a/implementations/micrometer-registry-kairos/gradle.lockfile b/implementations/micrometer-registry-kairos/gradle.lockfile
diff --git a/implementations/micrometer-registry-new-relic/gradle.lockfile b/implementations/micrometer-registry-new-relic/gradle.lockfile
diff --git a/implementations/micrometer-registry-opentsdb/gradle.lockfile b/implementations/micrometer-registry-opentsdb/gradle.lockfile
diff --git a/implementations/micrometer-registry-prometheus/gradle.lockfile b/implementations/micrometer-registry-prometheus/gradle.lockfile
diff --git a/implementations/micrometer-registry-signalfx/gradle.lockfile b/implementations/micrometer-registry-signalfx/gradle.lockfile
diff --git a/implementations/micrometer-registry-stackdriver/gradle.lockfile b/implementations/micrometer-registry-stackdriver/gradle.lockfile
diff --git a/implementations/micrometer-registry-statsd/gradle.lockfile b/implementations/micrometer-registry-statsd/gradle.lockfile
diff --git a/implementations/micrometer-registry-wavefront/gradle.lockfile b/implementations/micrometer-registry-wavefront/gradle.lockfile