Merge branch 'main' into gmavenPlusBump

Signed-off-by: Ryan Baxter <[email protected]>

Author: ryanjbaxter

docker/spring-cloud-contract-docker/pom.xml

@@ -108,11 +108,6 @@
 			<artifactId>spring-cloud-contract-stub-runner-boot</artifactId>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-contract-shade</artifactId>
-			<scope>compile</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>

docker/spring-cloud-contract-stub-runner-docker/pom.xml

@@ -151,11 +151,6 @@
 			<artifactId>spring-cloud-contract-stub-runner</artifactId>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-contract-shade</artifactId>
-			<scope>compile</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-contract-verifier</artifactId>

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>
@@ -38,16 +38,15 @@
 		<spock-spring.version>2.3-groovy-4.0
 		</spock-spring.version> <!-- @releaser:version-check-off -->
 		<hoverfly-junit.version>0.2.2</hoverfly-junit.version>
-		<commons-text.version>1.13.1</commons-text.version>
-		<handlebars.version>4.3.1</handlebars.version>
+		<handlebars.version>4.5.0</handlebars.version>
+		<commons-text.version>1.14.0</commons-text.version>
 		<jgit.version>7.3.0.202506031305-r</jgit.version>
 		<json-unit-assertj.version>4.1.1</json-unit-assertj.version>
-		<rest-assured.version>5.2.1</rest-assured.version>
+		<rest-assured.version>5.5.6</rest-assured.version>
 		<slf4j.version>[2.0.0,)</slf4j.version>
-		<thin-jar.version>1.0.30.RELEASE</thin-jar.version>
-
-		<junit-vintage.version>5.13.1</junit-vintage.version>
-		<junit-jupiter.version>5.13.1</junit-jupiter.version>
+		<thin-jar.version>1.0.31.RELEASE</thin-jar.version>
+		<junit-vintage.version>5.13.4</junit-vintage.version>
+		<junit-jupiter.version>5.13.4</junit-jupiter.version>
 		<gmavenplus-plugin.version>4.2.1</gmavenplus-plugin.version>
 		<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>  <!-- @releaser:version-check-off -->
 		<awaitility.version>4.2.2</awaitility.version>
@@ -81,7 +80,6 @@
 		<!-- TODO: temporarily disable -->
 		<!--<module>docker</module>-->
 		<module>docs</module>
-		<module>spring-cloud-contract-shade</module>
 		<module>spring-cloud-contract-wiremock</module>
 		<module>spring-cloud-contract-verifier</module>
 		<module>specs</module>
@@ -125,7 +123,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>

spring-cloud-contract-dependencies/pom.xml

@@ -65,11 +65,6 @@
 				<artifactId>spring-cloud-contract-stub-runner-boot</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-contract-shade</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-contract-verifier</artifactId>