Upgrade to Micrometer 2.0.0-SNAPSHOT

See #2072

- package changes

Author: garyrussell

build.gradle

@@ -66,7 +66,7 @@ ext {
 	junitJupiterVersion = '5.8.2'
 	kafkaVersion = '3.1.0'
 	log4jVersion = '2.17.1'
-	micrometerVersion = '2.0.0-M1'
+	micrometerVersion = '2.0.0-SNAPSHOT'
 	mockitoVersion = '4.0.0'
 	reactorVersion = '2020.0.16'
 	scalaVersion = '2.13'
@@ -338,6 +338,7 @@ project ('spring-kafka') {
 		optionalApi 'io.projectreactor:reactor-core'
 		optionalApi 'io.projectreactor.kafka:reactor-kafka'
 		optionalApi "io.micrometer:micrometer-core:$micrometerVersion"
+        optionalApi "io.micrometer:micrometer-binders:$micrometerVersion"
 
 		testImplementation project (':spring-kafka-test')
 		testImplementation 'io.projectreactor:reactor-test'

spring-kafka/src/main/java/org/springframework/kafka/core/MicrometerConsumerListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,10 @@
 
 import org.apache.kafka.clients.consumer.Consumer;
 
+import io.micrometer.binder.kafka.KafkaClientMetrics;
 import io.micrometer.core.instrument.ImmutableTag;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
-import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
 
 /**
  * A consumer factory listener that manages {@link KafkaClientMetrics}.

spring-kafka/src/main/java/org/springframework/kafka/core/MicrometerProducerListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,10 @@
 
 import org.apache.kafka.clients.producer.Producer;
 
+import io.micrometer.binder.kafka.KafkaClientMetrics;
 import io.micrometer.core.instrument.ImmutableTag;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
-import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
 
 /**
  * A producer factory listener that manages {@link KafkaClientMetrics}.

spring-kafka/src/main/java/org/springframework/kafka/streams/KafkaStreamsMicrometerListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,10 @@
 
 import org.springframework.kafka.config.StreamsBuilderFactoryBean;
 
+import io.micrometer.binder.kafka.KafkaStreamsMetrics;
 import io.micrometer.core.instrument.ImmutableTag;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
-import io.micrometer.core.instrument.binder.kafka.KafkaStreamsMetrics;
 
 /**
  * Creates a {@link KafkaStreamsMetrics} for the {@link KafkaStreams}.