Merge remote-tracking branch 'origin/4.2.x' into 4.3.x

Signed-off-by: Olga Maciaszek-Sharma <[email protected]>

# Conflicts:
#	spring-cloud-contract-stub-runner-boot/pom.xml

Author: OlgaMaciaszek

docker/spring-cloud-contract-stub-runner-docker/Dockerfile

@@ -34,7 +34,5 @@ COPY --chown=scc:scc target/maven_dependencies /home/scc/.m2/repository/
 COPY --chown=scc:scc target/libs/stub-runner-boot.jar stub-runner-boot.jar
 RUN echo "Fetching dependencies, please wait..."
 RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar --thin.repo=${THIN_REPO}
-RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar --thin.profile=rabbit --thin.repo=${THIN_REPO}
-RUN java -Dthin.dryrun=true -jar stub-runner-boot.jar --thin.profile=kafka --thin.repo=${THIN_REPO}
 COPY --chown=scc:scc run.sh run.sh
 ENTRYPOINT ["./run.sh"]

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

@@ -288,7 +288,7 @@
 		<profile>
 			<id>milestone</id>
 			<properties>
-				<thin.repo>https://repo.spring.io/milestone</thin.repo>
+				<thin.repo>https://repo.maven.apache.org/maven2</thin.repo>
 			</properties>
 		</profile>
 		<profile>

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

@@ -25,14 +25,10 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-rabbit</artifactId>
-			<!--Because of the docker creation process explicit version is needed-->
-			<version>4.3.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-kafka</artifactId>
-			<!--Because of the docker creation process explicit version is needed-->
-			<version>4.3.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -70,4 +66,15 @@
 			</plugin>
 		</plugins>
 	</build>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-stream-dependencies</artifactId>
+				<version>${spring-cloud-stream.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 </project>