Merge branch '4.0.x'

See gh-49557

module/spring-boot-micrometer-tracing-opentelemetry/src/main/java/org/springframework/boot/micrometer/tracing/opentelemetry/autoconfigure/zipkin/ZipkinWithOpenTelemetryTracingAutoConfiguration.java

@@ -40,10 +40,12 @@ import org.springframework.context.annotation.Bean;
  * @author Wick Dynex
  * @author Phillip Webb
  * @since 4.0.0
+ * @deprecated since 4.0.4 for removal in 4.2.0
  */
 @SuppressWarnings("deprecation")
 @AutoConfiguration(afterName = "org.springframework.boot.zipkin.autoconfigure.ZipkinAutoConfiguration")
 @ConditionalOnClass({ ZipkinSpanExporter.class, Span.class })
+@Deprecated(since = "4.0.4", forRemoval = true)
 public final class ZipkinWithOpenTelemetryTracingAutoConfiguration {
 
 	@Bean

module/spring-boot-micrometer-tracing-opentelemetry/src/test/java/org/springframework/boot/micrometer/tracing/opentelemetry/autoconfigure/zipkin/ZipkinWithOpenTelemetryTracingAutoConfigurationTests.java

@@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Moritz Halbritter
  */
-@SuppressWarnings("deprecation")
+@SuppressWarnings({ "removal", "deprecation" })
 class ZipkinWithOpenTelemetryTracingAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()