More fixes to the java16 build

docker/spring-cloud-contract-docker/project/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessagesSpec.groovy

@@ -75,6 +75,7 @@ class SpringAmqpStubMessagesSpec extends Specification {
 			})
 	}
 
+	// for JDK 16 the merge option won't work and the metadata needs to be FULLY applied
 	def "should send amqp message with metadata id"() {
 		given:
 			listenerContainer.setMessageListener(messageListenerAdapter)
@@ -93,7 +94,9 @@ class SpringAmqpStubMessagesSpec extends Specification {
 						"amqp": [
 							"input": ["messageProperties": [
 								correlationId: "correlationIdValue",
-								consumerQueue: "queue"]]
+								consumerQueue: "queue",
+								contentType: CONTENT_TYPE_JSON,
+								receivedRoutingKey: routingKey]]
 						],
 						"verifierMessage" : [messageType: "INPUT"]
 					]))

spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/messaging/amqp/AmqpMetadataTests.java

@@ -25,7 +25,7 @@ import static org.assertj.core.api.BDDAssertions.then;
 class AmqpMetadataTests {
 
 	YAMLMapper mapper = new YAMLMapper();
-	
+
 	@Test
 	void should_parse_the_metadata_entry() throws JsonProcessingException {
 		// @formatter:off