Merge branch '1.2.x' into 1.3.x

Author: shakuzen

gradle/libs.versions.toml

@@ -23,12 +23,12 @@ testcontainers = "1.19.8"
 braveBom = "6.0.3"
 bravePropagationW3c = "0.2.0"
 zipkinReporterBom = "3.4.0"
-reactorBom = "2022.0.21"
+reactorBom = "2022.0.22"
 asmForPlugins = "7.3.1"
-javaFormatForPlugins = "0.0.42"
+javaFormatForPlugins = "0.0.43"
 jsr305 = "3.0.2"
 aspectjweaver = "1.9.22.1"
-spring = "5.3.37"
+spring = "5.3.39"
 
 [libraries]
 aopAlliance = { module = "aopalliance:aopalliance", version.ref = "aopalliance" }
@@ -74,7 +74,7 @@ plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", ve
 plugin-nebulaInfo = { module = "com.netflix.nebula:gradle-info-plugin", version = "12.1.6" }
 plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" }
 plugin-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" }
-plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.42" }
+plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version = "0.0.43" }
 plugin-jmh = { module = "me.champeau.jmh:jmh-gradle-plugin", version = "0.7.2" }
 plugin-spring-antora = { module = "io.spring.gradle.antora:spring-antora-plugin", version = "0.0.1" }
 plugin-antora = { module = "org.antora:gradle-antora-plugin", version = "1.0.0" }

micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/bridge/BraveSpanTest.java

@@ -22,7 +22,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class BraveSpanTest {
+class BraveSpanTest {
 
     TestSpanHandler handler = new TestSpanHandler();
 

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'
 }