Merge remote-tracking branch 'origin/main'

# Conflicts:
#	docker/spring-cloud-contract-docker/project/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties
This commit is contained in:
Olga MaciaszekSharma
2024-03-21 17:38:05 +01:00
53 changed files with 96 additions and 80 deletions

View File

@@ -12,13 +12,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-docker-parent</artifactId>
<version>4.1.2-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-docker</artifactId>
<packaging>pom</packaging>
<version>4.1.2-SNAPSHOT</version>
<version>4.1.1-SNAPSHOT</version>
<name>Spring Cloud Contract Docker</name>
<description>Spring Cloud Contract Docker</description>

View File

@@ -1,4 +1,4 @@
org.gradle.daemon=false
verifierVersion=4.1.2-SNAPSHOT
springBootVersion=3.2.3
springBootVersion=3.2.4-SNAPSHOT
camelVersion=3.11.0