Merge branch 'main' into feature/kafka4

Author: Shekharrajak

flink-connector-kafka/src/main/java/org/apache/flink/connector/kafka/sink/internal/FlinkKafkaInternalProducer.java

@@ -179,7 +179,7 @@ public long getProducerId() {
     public void setTransactionId(String transactionalId) {
         checkState(
                 !isInTransaction(),
-                String.format("Another transaction %s is still open.", transactionalId));
+                String.format("Another transaction %s is still open.", this.transactionalId));
         LOG.debug("Change transaction id from {} to {}", this.transactionalId, transactionalId);
         this.transactionalId = transactionalId;
         Object transactionManager = getTransactionManager();

flink-connector-kafka/src/test/java/org/apache/flink/connector/kafka/testutils/KafkaUtil.java

@@ -67,7 +67,6 @@ public static KafkaContainer createKafkaContainer(String containerName) {
                 .withEnv("KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR", "1")
                 .withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", "1")
                 .withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", "1")
-                .withEnv("KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE", "false")
                 .withEnv("KAFKA_LOG4J_ROOT_LOGLEVEL", logLevel)
                 .withEnv("KAFKA_LOG4J_LOGGERS", "state.change.logger=" + logLevel)
                 .withEnv("KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE", "false")

pom.xml

@@ -54,7 +54,9 @@ under the License.
 		<!-- Main Dependencies -->
 		<confluent.version>7.9.2</confluent.version>
 		<flink.version>2.1.0</flink.version>
+
 		<kafka.version>4.1.0</kafka.version>
+
 		<!-- Other Dependencies -->
 		<avro.version>1.12.0</avro.version>
 		<byte-buddy.version>1.12.10</byte-buddy.version>