From d27a03c371e4b47724916a473dfebc03736630ec Mon Sep 17 00:00:00 2001 From: izeye Date: Thu, 17 Jun 2021 21:39:08 +0900 Subject: [PATCH 1/2] Fix typo --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 46ac639a0a..8a829b8dc8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -67,6 +67,6 @@ dependencies { ## Running Docker integration tests -Micrometer has a number of integration tests that are implemented with [Testcontainers](https://www.testcontainers.org/) and uses Docker. These tests do not run by default. +Micrometer has a number of integration tests that are implemented with [Testcontainers](https://www.testcontainers.org/) and use Docker. These tests do not run by default. You need a Docker daemon running for these tests to work. You can run them with the `dockerTest` task. For example, with the Gradle wrapper: `./gradlew dockerTest`. From a9fd2947ae3e37882dad03994ab59f46450f74cf Mon Sep 17 00:00:00 2001 From: Tommy Ludwig <8924140+shakuzen@users.noreply.github.com> Date: Wed, 23 Jun 2021 13:43:18 +0900 Subject: [PATCH 2/2] Upgrade to reactor 3.3.18, reactor-netty 0.9.21, netty 4.1.65 Closes gh-2661 --- .../testCompileClasspath.lockfile | 28 ++++++++--------- .../testRuntimeClasspath.lockfile | 28 ++++++++--------- .../compileClasspath.lockfile | 24 +++++++-------- .../gradle/dependency-locks/default.lockfile | 24 +++++++-------- .../runtimeClasspath.lockfile | 24 +++++++-------- .../testCompileClasspath.lockfile | 26 ++++++++-------- .../testRuntimeClasspath.lockfile | 26 ++++++++-------- .../compileClasspath.lockfile | 28 ++++++++--------- .../runtimeClasspath.lockfile | 28 ++++++++--------- .../testCompileClasspath.lockfile | 30 +++++++++---------- .../testRuntimeClasspath.lockfile | 30 +++++++++---------- .../testCompileClasspath.lockfile | 28 ++++++++--------- .../testRuntimeClasspath.lockfile | 28 ++++++++--------- .../compileClasspath.lockfile | 28 ++++++++--------- 14 files changed, 190 insertions(+), 190 deletions(-) diff --git a/implementations/micrometer-registry-graphite/gradle/dependency-locks/testCompileClasspath.lockfile b/implementations/micrometer-registry-graphite/gradle/dependency-locks/testCompileClasspath.lockfile index 33b0bd2754..effeae5389 100644 --- a/implementations/micrometer-registry-graphite/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/implementations/micrometer-registry-graphite/gradle/dependency-locks/testCompileClasspath.lockfile @@ -24,20 +24,20 @@ commons-io:commons-io:2.2 commons-logging:commons-logging:1.2 io.dropwizard.metrics:metrics-core:4.1.6 io.dropwizard.metrics:metrics-graphite:4.1.6 -io.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-http2:4.1.63.Final -io.netty:netty-codec-http:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-http2:4.1.65.Final +io.netty:netty-codec-http:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE javax.servlet:javax.servlet-api:3.1.0 junit:junit:4.12 net.bytebuddy:byte-buddy-agent:1.10.5 diff --git a/implementations/micrometer-registry-graphite/gradle/dependency-locks/testRuntimeClasspath.lockfile b/implementations/micrometer-registry-graphite/gradle/dependency-locks/testRuntimeClasspath.lockfile index 76bca76074..1e342cd639 100644 --- a/implementations/micrometer-registry-graphite/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/implementations/micrometer-registry-graphite/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -24,20 +24,20 @@ commons-io:commons-io:2.2 commons-logging:commons-logging:1.2 io.dropwizard.metrics:metrics-core:4.1.6 io.dropwizard.metrics:metrics-graphite:4.1.6 -io.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-http2:4.1.63.Final -io.netty:netty-codec-http:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-http2:4.1.65.Final +io.netty:netty-codec-http:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE javax.servlet:javax.servlet-api:3.1.0 junit:junit:4.12 net.bytebuddy:byte-buddy-agent:1.10.5 diff --git a/implementations/micrometer-registry-statsd/gradle/dependency-locks/compileClasspath.lockfile b/implementations/micrometer-registry-statsd/gradle/dependency-locks/compileClasspath.lockfile index 5d595578e8..82430ad03a 100644 --- a/implementations/micrometer-registry-statsd/gradle/dependency-locks/compileClasspath.lockfile +++ b/implementations/micrometer-registry-statsd/gradle/dependency-locks/compileClasspath.lockfile @@ -2,17 +2,17 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2 -io.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE org.hdrhistogram:HdrHistogram:2.1.12 org.reactivestreams:reactive-streams:1.0.3 diff --git a/implementations/micrometer-registry-statsd/gradle/dependency-locks/default.lockfile b/implementations/micrometer-registry-statsd/gradle/dependency-locks/default.lockfile index 9b735aca68..9cabd01dd4 100644 --- a/implementations/micrometer-registry-statsd/gradle/dependency-locks/default.lockfile +++ b/implementations/micrometer-registry-statsd/gradle/dependency-locks/default.lockfile @@ -1,18 +1,18 @@ # 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.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE org.hdrhistogram:HdrHistogram:2.1.12 org.latencyutils:LatencyUtils:2.0.3 org.reactivestreams:reactive-streams:1.0.3 diff --git a/implementations/micrometer-registry-statsd/gradle/dependency-locks/runtimeClasspath.lockfile b/implementations/micrometer-registry-statsd/gradle/dependency-locks/runtimeClasspath.lockfile index 648986c213..6471525cdb 100644 --- a/implementations/micrometer-registry-statsd/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/implementations/micrometer-registry-statsd/gradle/dependency-locks/runtimeClasspath.lockfile @@ -2,18 +2,18 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2 -io.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE org.hdrhistogram:HdrHistogram:2.1.12 org.latencyutils:LatencyUtils:2.0.3 org.reactivestreams:reactive-streams:1.0.3 diff --git a/implementations/micrometer-registry-statsd/gradle/dependency-locks/testCompileClasspath.lockfile b/implementations/micrometer-registry-statsd/gradle/dependency-locks/testCompileClasspath.lockfile index 4b99663b4f..04ec0edd8f 100644 --- a/implementations/micrometer-registry-statsd/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/implementations/micrometer-registry-statsd/gradle/dependency-locks/testCompileClasspath.lockfile @@ -23,19 +23,19 @@ commons-codec:commons-codec:1.11 commons-fileupload:commons-fileupload:1.4 commons-io:commons-io:2.2 commons-logging:commons-logging:1.2 -io.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE -io.projectreactor:reactor-test:3.3.17.RELEASE +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE +io.projectreactor:reactor-test:3.3.18.RELEASE javax.servlet:javax.servlet-api:3.1.0 junit:junit:4.12 net.bytebuddy:byte-buddy-agent:1.10.5 diff --git a/implementations/micrometer-registry-statsd/gradle/dependency-locks/testRuntimeClasspath.lockfile b/implementations/micrometer-registry-statsd/gradle/dependency-locks/testRuntimeClasspath.lockfile index a0fbde6441..17dc2fd639 100644 --- a/implementations/micrometer-registry-statsd/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/implementations/micrometer-registry-statsd/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -23,19 +23,19 @@ commons-codec:commons-codec:1.11 commons-fileupload:commons-fileupload:1.4 commons-io:commons-io:2.2 commons-logging:commons-logging:1.2 -io.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE -io.projectreactor:reactor-test:3.3.17.RELEASE +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE +io.projectreactor:reactor-test:3.3.18.RELEASE javax.servlet:javax.servlet-api:3.1.0 junit:junit:4.12 net.bytebuddy:byte-buddy-agent:1.10.5 diff --git a/micrometer-core/gradle/dependency-locks/compileClasspath.lockfile b/micrometer-core/gradle/dependency-locks/compileClasspath.lockfile index afe5dd7cf4..61ff186c2a 100644 --- a/micrometer-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/micrometer-core/gradle/dependency-locks/compileClasspath.lockfile @@ -29,20 +29,20 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 io.dropwizard.metrics:metrics-core:4.0.7 -io.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-http2:4.1.63.Final -io.netty:netty-codec-http:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-http2:4.1.65.Final +io.netty:netty-codec-http:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE io.reactivex:rxjava:1.2.0 javax.activation:javax.activation-api:1.2.0 javax.cache:cache-api:1.1.1 diff --git a/micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile b/micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile index afe5dd7cf4..61ff186c2a 100644 --- a/micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -29,20 +29,20 @@ commons-configuration:commons-configuration:1.8 commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 io.dropwizard.metrics:metrics-core:4.0.7 -io.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-http2:4.1.63.Final -io.netty:netty-codec-http:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-http2:4.1.65.Final +io.netty:netty-codec-http:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE io.reactivex:rxjava:1.2.0 javax.activation:javax.activation-api:1.2.0 javax.cache:cache-api:1.1.1 diff --git a/micrometer-core/gradle/dependency-locks/testCompileClasspath.lockfile b/micrometer-core/gradle/dependency-locks/testCompileClasspath.lockfile index 6bf51af3b3..aed7212209 100644 --- a/micrometer-core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/micrometer-core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -44,21 +44,21 @@ commons-logging:commons-logging:1.2 de.flapdoodle.embed:de.flapdoodle.embed.mongo:2.2.0 de.flapdoodle.embed:de.flapdoodle.embed.process:2.1.2 io.dropwizard.metrics:metrics-core:4.0.7 -io.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-http2:4.1.63.Final -io.netty:netty-codec-http:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE -io.projectreactor:reactor-test:3.3.17.RELEASE +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-http2:4.1.65.Final +io.netty:netty-codec-http:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE +io.projectreactor:reactor-test:3.3.18.RELEASE io.reactivex:rxjava:1.2.0 javax.activation:javax.activation-api:1.2.0 javax.cache:cache-api:1.1.1 diff --git a/micrometer-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/micrometer-core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 7d92018e07..20dcc6e8d1 100644 --- a/micrometer-core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/micrometer-core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -44,21 +44,21 @@ commons-logging:commons-logging:1.2 de.flapdoodle.embed:de.flapdoodle.embed.mongo:2.2.0 de.flapdoodle.embed:de.flapdoodle.embed.process:2.1.2 io.dropwizard.metrics:metrics-core:4.0.7 -io.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-http2:4.1.63.Final -io.netty:netty-codec-http:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE -io.projectreactor:reactor-test:3.3.17.RELEASE +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-http2:4.1.65.Final +io.netty:netty-codec-http:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE +io.projectreactor:reactor-test:3.3.18.RELEASE io.reactivex:rxjava:1.2.0 javax.activation:javax.activation-api:1.2.0 javax.cache:cache-api:1.1.1 diff --git a/micrometer-test/gradle/dependency-locks/testCompileClasspath.lockfile b/micrometer-test/gradle/dependency-locks/testCompileClasspath.lockfile index 1b04660e08..fec5e04fcc 100644 --- a/micrometer-test/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/micrometer-test/gradle/dependency-locks/testCompileClasspath.lockfile @@ -25,20 +25,20 @@ commons-codec:commons-codec:1.11 commons-fileupload:commons-fileupload:1.4 commons-io:commons-io:2.2 commons-logging:commons-logging:1.2 -io.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-http2:4.1.63.Final -io.netty:netty-codec-http:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-http2:4.1.65.Final +io.netty:netty-codec-http:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE javax.annotation:jsr250-api:1.0 javax.cache:cache-api:1.1.1 javax.enterprise:cdi-api:1.0-SP4 diff --git a/micrometer-test/gradle/dependency-locks/testRuntimeClasspath.lockfile b/micrometer-test/gradle/dependency-locks/testRuntimeClasspath.lockfile index cab01c8dd2..5a3547b61c 100644 --- a/micrometer-test/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/micrometer-test/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -25,20 +25,20 @@ commons-codec:commons-codec:1.11 commons-fileupload:commons-fileupload:1.4 commons-io:commons-io:2.2 commons-logging:commons-logging:1.2 -io.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-http2:4.1.63.Final -io.netty:netty-codec-http:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-http2:4.1.65.Final +io.netty:netty-codec-http:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE javax.annotation:jsr250-api:1.0 javax.cache:cache-api:1.1.1 javax.enterprise:cdi-api:1.0-SP4 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile index c9351d2139..f362db36ee 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile @@ -66,23 +66,23 @@ io.grpc:grpc-netty-shaded:1.28.1 io.grpc:grpc-protobuf-lite:1.28.1 io.grpc:grpc-protobuf:1.28.1 io.grpc:grpc-stub:1.28.1 -io.netty:netty-buffer:4.1.63.Final -io.netty:netty-codec-http2:4.1.63.Final -io.netty:netty-codec-http:4.1.63.Final -io.netty:netty-codec-socks:4.1.63.Final -io.netty:netty-codec:4.1.63.Final -io.netty:netty-common:4.1.63.Final -io.netty:netty-handler-proxy:4.1.63.Final -io.netty:netty-handler:4.1.63.Final -io.netty:netty-resolver:4.1.63.Final -io.netty:netty-transport-native-epoll:4.1.63.Final -io.netty:netty-transport-native-unix-common:4.1.63.Final -io.netty:netty-transport:4.1.63.Final +io.netty:netty-buffer:4.1.65.Final +io.netty:netty-codec-http2:4.1.65.Final +io.netty:netty-codec-http:4.1.65.Final +io.netty:netty-codec-socks:4.1.65.Final +io.netty:netty-codec:4.1.65.Final +io.netty:netty-common:4.1.65.Final +io.netty:netty-handler-proxy:4.1.65.Final +io.netty:netty-handler:4.1.65.Final +io.netty:netty-resolver:4.1.65.Final +io.netty:netty-transport-native-epoll:4.1.65.Final +io.netty:netty-transport-native-unix-common:4.1.65.Final +io.netty:netty-transport:4.1.65.Final io.opencensus:opencensus-api:0.24.0 io.opencensus:opencensus-contrib-http-util:0.24.0 io.perfmark:perfmark-api:0.19.0 -io.projectreactor.netty:reactor-netty:0.9.20.RELEASE -io.projectreactor:reactor-core:3.3.17.RELEASE +io.projectreactor.netty:reactor-netty:0.9.21.RELEASE +io.projectreactor:reactor-core:3.3.18.RELEASE io.prometheus:simpleclient:0.8.1 io.prometheus:simpleclient_common:0.8.1 io.prometheus:simpleclient_pushgateway:0.8.1