diff --git a/pom.xml b/pom.xml
index 6d826de31e..f8dde69af2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<checkstyle.version>2.17</checkstyle.version>
 		<pact.version>3.6.14</pact.version>
 		<jsch-agent.version>0.0.9</jsch-agent.version>
-		<spring-cloud-build.version>2.2.3.RELEASE</spring-cloud-build.version>
+		<spring-cloud-build.version>2.3.0.BUILD-SNAPSHOT</spring-cloud-build.version>
 		<spring-cloud-zookeeper.version>2.2.2.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
 		<spring-cloud-stream.version>Horsham.SR3</spring-cloud-stream.version>
 		<!-- Needs to come from a sc-stream-bom -->
diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java
index 3cdeadd1ee..d682449cd7 100644
--- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java
+++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java
@@ -29,6 +29,7 @@ import org.mockito.ArgumentMatchers;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageListener;
 import org.springframework.amqp.core.MessagePropertiesBuilder;
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
 import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
@@ -171,7 +172,9 @@ public class SpringAmqpStubMessages implements MessageVerifier<Message> {
 			// backward compatibility
 			return true;
 		}
-		return !this.rabbitProperties.isPublisherConfirms();
+		return this.rabbitProperties.getPublisherConfirmType() == null
+				|| this.rabbitProperties
+						.getPublisherConfirmType() == CachingConnectionFactory.ConfirmType.NONE;
 	}
 
 	@Override
diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessagesSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessagesSpec.groovy
index 845950b2f1..dff2b3d92a 100644
--- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessagesSpec.groovy
+++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessagesSpec.groovy
@@ -27,6 +27,7 @@ import org.springframework.amqp.core.DirectExchange
 import org.springframework.amqp.core.Message
 import org.springframework.amqp.core.MessageProperties
 import org.springframework.amqp.core.Queue
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory
 import org.springframework.amqp.rabbit.core.RabbitTemplate
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer
 import org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter
@@ -78,7 +79,7 @@ class SpringAmqpStubMessagesSpec extends Specification {
 
 	def "should send amqp message for non transactional channel"() {
 		given:
-			rabbitProperties.setPublisherConfirms(true)
+			rabbitProperties.setPublisherConfirmType(CachingConnectionFactory.ConfirmType.SIMPLE)
 			listenerContainer.setMessageListener(messageListenerAdapter)
 			listenerContainer.setQueueNames(queueName)
 			Binding binding = BindingBuilder.bind(new Queue(queueName)).to(new DirectExchange(exchange)).with(routingKey)
@@ -114,7 +115,7 @@ class SpringAmqpStubMessagesSpec extends Specification {
 
 	def "should send amqp message for transactional channel"() {
 		given:
-			rabbitProperties.setPublisherConfirms(false)
+			rabbitProperties.setPublisherConfirmType(CachingConnectionFactory.ConfirmType.NONE)
 			listenerContainer.setMessageListener(messageListenerAdapter)
 			listenerContainer.setQueueNames(queueName)
 			Binding binding = BindingBuilder.bind(new Queue(queueName)).to(new DirectExchange(exchange)).with(routingKey)
diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml
index 98001bb1d7..ef756a9674 100644
--- a/tests/samples-messaging-amqp/pom.xml
+++ b/tests/samples-messaging-amqp/pom.xml
@@ -18,6 +18,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-json</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-amqp</artifactId>