GH-1621: More back-ported test fixes

Author: garyrussell

spring-kafka/src/test/java/org/springframework/kafka/listener/ManualNackRecordTxTests.java

@@ -41,7 +41,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerGroupMetadata;
 import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -212,7 +211,6 @@ public Consumer consumer() {
 				this.closeLatch.countDown();
 				return null;
 			}).given(consumer).close();
-			given(consumer.groupMetadata()).willReturn(mock(ConsumerGroupMetadata.class));
 			return consumer;
 		}
 
@@ -236,10 +234,10 @@ ProducerFactory pf() {
 			return pf;
 		}
 
-		@SuppressWarnings("rawtypes")
+		@SuppressWarnings({ "rawtypes", "unchecked" })
 		@Bean
 		KafkaTransactionManager tm() {
-			return new KafkaTransactionManager<>(pf());
+			return new KafkaTransactionManager(pf());
 		}
 
 		@SuppressWarnings({ "rawtypes", "unchecked" })