Merge branch '1.12.x' into 1.13.x

Author: shakuzen

docs/src/test/java/io/micrometer/docs/netty/NettyMetricsTests.java

@@ -45,7 +45,7 @@
 /**
  * Sources for netty/index.adoc
  */
-public class NettyMetricsTests {
+class NettyMetricsTests {
 
     private SimpleMeterRegistry registry = new SimpleMeterRegistry(SimpleConfig.DEFAULT, new MockClock());
 

gradle/libs.versions.toml

@@ -10,7 +10,7 @@ caffeine = "2.9.3"
 cloudwatch2 = "2.25.70"
 colt = "1.2.0"
 dagger = "2.51.1"
-dropwizard-metrics = "4.2.26"
+dropwizard-metrics = "4.2.27"
 dropwizard-metrics5 = "5.0.0"
 dynatrace-utils = "2.2.1"
 ehcache2 = "2.10.9.2"
@@ -70,13 +70,13 @@ okhttp = "4.11.0"
 postgre = "42.7.3"
 prometheus = "1.2.1"
 prometheusSimpleClient = "0.16.0"
-reactor = "2022.0.21"
+reactor = "2022.0.22"
 rest-assured = "5.4.0"
-signalfx = "1.0.44"
+signalfx = "1.0.45"
 slf4j = "1.7.36"
-spectator-atlas = "1.7.18"
+spectator-atlas = "1.7.19"
 spring = "5.3.37"
-spring-javaformat = "0.0.42"
+spring-javaformat = "0.0.43"
 testcontainers = "1.19.8"
 tomcat = "8.5.100"
 wavefront = "3.4.3"
@@ -176,7 +176,7 @@ logbackLatest = {module = "ch.qos.logback:logback-classic", version.ref = "logba
 log4j = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 mavenResolverConnectorBasic = { module = "org.apache.maven.resolver:maven-resolver-connector-basic", version.ref = "maven-resolver" }
 mavenResolverTransportHttp = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "maven-resolver" }
-mavenResolverProvider = { module = "org.apache.maven:maven-resolver-provider", version = "3.9.8" }
+mavenResolverProvider = { module = "org.apache.maven:maven-resolver-provider", version = "3.9.9" }
 mockitoCore4 = { module = "org.mockito:mockito-core", version.ref = "mockito4" }
 mockitoCore5 = { module = "org.mockito:mockito-core", version.ref = "mockito5" }
 mongoSync = { module = "org.mongodb:mongodb-driver-sync", version.ref = "mongo" }

micrometer-test/src/main/java/io/micrometer/core/tck/DefaultLongTaskTimerTest.java

@@ -35,8 +35,12 @@
 import static io.micrometer.core.instrument.MockClock.clock;
 import static org.assertj.core.api.Assertions.assertThat;
 
+// Test class is public and in main code... by mistake?
+//CHECKSTYLE:OFF
 public class DefaultLongTaskTimerTest {
 
+    // CHECKSTYLE:ON
+
     @Test
     @DisplayName("supports sending histograms of active task duration")
     void histogram() {

settings.gradle

@@ -6,7 +6,7 @@ pluginManagement {
 
 plugins {
     id 'com.gradle.develocity' version '3.17.6'
-    id 'io.spring.develocity.conventions' version '0.0.19'
+    id 'io.spring.develocity.conventions' version '0.0.20'
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }