From bd8b82e9ddfeef6681af62fc7ce3b568e32897da Mon Sep 17 00:00:00 2001
From: Artem Bilan <artem.bilan@broadcom.com>
Date: Mon, 20 May 2024 10:35:58 -0400
Subject: [PATCH] Some upgrades; prepare for release

* Upgrade to `com.gradle.develocity` plugin
* Fix upgrade for Micrometer dependencies into `1.3.0` & `1.13.0`
since Dependabot has jumped to the next SNAPSHOT somehow
* Fix compilation warning in the `KafkaTemplate.observeSend()`
for unused `AutoClosable` resource - the `@SuppressWarnings("try")` is enough for the logic
---
 build.gradle                                                  | 4 ++--
 settings.gradle                                               | 2 +-
 .../java/org/springframework/kafka/core/KafkaTemplate.java    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index dd61175e..7df978d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -63,8 +63,8 @@ ext {
 	kotlinCoroutinesVersion = '1.8.1'
 	log4jVersion = '2.23.1'
 	micrometerDocsVersion = '1.0.2'
-	micrometerVersion = '1.13.1-SNAPSHOT'
-	micrometerTracingVersion = '1.3.1-SNAPSHOT'
+	micrometerVersion = '1.13.0'
+	micrometerTracingVersion = '1.3.0'
 	mockitoVersion = '5.10.0'
 	reactorVersion = '2023.0.6'
 	scalaVersion = '2.13'
diff --git a/settings.gradle b/settings.gradle
index 01567e53..8580c2ae 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,7 +7,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'com.gradle.enterprise' version '3.17.4'
+	id 'com.gradle.develocity' version '3.17.4'
 	id 'io.spring.ge.conventions' version '0.0.17'
 }
 
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaTemplate.java b/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaTemplate.java
index 4ce5f4c2..a1e60433 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaTemplate.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaTemplate.java
@@ -761,6 +761,7 @@ public class KafkaTemplate<K, V> implements KafkaOperations<K, V>, ApplicationCo
 		}
 	}
 
+	@SuppressWarnings("try")
 	private CompletableFuture<SendResult<K, V>> observeSend(final ProducerRecord<K, V> producerRecord) {
 		Observation observation = KafkaTemplateObservation.TEMPLATE_OBSERVATION.observation(
 				this.observationConvention, DefaultKafkaTemplateObservationConvention.INSTANCE,