Merge pull request #2292 from marcingrzejszczak/bumpCamel

BUmped Camel to 4.x

Author: ryanjbaxter

pom.xml

@@ -25,7 +25,7 @@
 	<properties>
 		<spring-boot.version>4.0.0-M2</spring-boot.version>
 		<!-- Align it also in Docker image under [docker/spring-cloud-contract-docker/project/gradle.properties] -->
-		<camel.version>3.22.4</camel.version>
+		<camel.version>4.14.0</camel.version>
 		<jsch-agent.version>0.0.9</jsch-agent.version>
 		<spring-cloud-build.version>5.0.0-SNAPSHOT</spring-cloud-build.version>
 		<spring-cloud-zookeeper.version>5.0.0-SNAPSHOT</spring-cloud-zookeeper.version>
@@ -125,7 +125,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.camel.springboot</groupId>
-				<artifactId>camel-rabbitmq-starter</artifactId>
+				<artifactId>camel-spring-rabbitmq-starter</artifactId>
 				<version>${camel.version}</version>
 			</dependency>
 			<dependency>

tests/samples-messaging-camel/pom.xml

@@ -14,9 +14,13 @@
 	<name>Spring Cloud Contract Sample Camel</name>
 	<description>Spring Cloud Contract Sample Camel</description>
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.retry</groupId>
+			<artifactId>spring-retry</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.camel.springboot</groupId>
-			<artifactId>camel-rabbitmq-starter</artifactId>
+			<artifactId>camel-spring-rabbitmq-starter</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.camel.springboot</groupId>

tests/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java

@@ -19,10 +19,10 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.RoutesBuilder;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.rabbitmq.RabbitMQComponent;
+import org.apache.camel.component.springrabbit.SpringRabbitMQComponent;
 import org.apache.camel.model.dataformat.JsonLibrary;
 
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -33,22 +33,22 @@
 public class BookRouteConfiguration {
 
 	@Bean
-	RoutesBuilder myRouter(final BookService bookService, CamelContext context,
-			@Value("${spring.rabbitmq.port}") int port) {
+	RoutesBuilder myRouter(final BookService bookService, CamelContext context, ConnectionFactory connectionFactory) {
 		return new RouteBuilder() {
 
 			@Override
 			public void configure() throws Exception {
-				RabbitMQComponent component = context.getComponent("rabbitmq", RabbitMQComponent.class);
-				component.setAddresses("localhost:" + port);
+				SpringRabbitMQComponent component = context.getComponent("spring-rabbitmq",
+						SpringRabbitMQComponent.class);
+				component.setConnectionFactory(connectionFactory);
 
 				// scenario 1 - from bean to output
 				from("direct:start").unmarshal()
 					.json(JsonLibrary.Jackson, BookReturned.class)
 					.bean(bookService)
 					.marshal()
 					.json(JsonLibrary.Jackson, BookReturned.class)
-					.to("rabbitmq:output?queue=output");
+					.to("spring-rabbitmq:output?queues=output");
 			}
 
 		};

tests/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy

@@ -40,7 +40,7 @@ import org.springframework.test.context.DynamicPropertySource
  */
 // Context configuration would end up in base class
 @AutoConfigureMessageVerifier
-@SpringBootTest(classes = CamelMessagingApplication, properties = 'camel.component.rabbitmq.declare=true')
+@SpringBootTest(classes = CamelMessagingApplication, properties = 'camel.component.spring-rabbitmq.auto-declare-producer=true')
 @Testcontainers
 class CamelMessagingApplicationSpec {
 
@@ -82,7 +82,7 @@ class CamelMessagingApplicationSpec {
 		when:
 			bookReturnedTriggered()
 		then:
-			def response = contractVerifierMessaging.receive('rabbitmq:output?queue=output')
+			def response = contractVerifierMessaging.receive('spring-rabbitmq:output?queues=output')
 			assert response.headers.get('BOOK-NAME') == 'foo'
 		and:
 			DocumentContext parsedJson = JsonPath.