Merge remote-tracking branch 'origin/4.2.x'
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com> # Conflicts: # docker/pom.xml # docker/spring-cloud-contract-docker/pom.xml # docker/spring-cloud-contract-docker/project/gradle.properties # docker/spring-cloud-contract-stub-runner-docker/pom.xml # docs/pom.xml # pom.xml # specs/pom.xml # specs/spring-cloud-contract-spec-groovy/pom.xml # specs/spring-cloud-contract-spec-java/pom.xml # specs/spring-cloud-contract-spec-kotlin/pom.xml # specs/spring-cloud-contract-spec/pom.xml # spring-cloud-contract-dependencies/pom.xml # spring-cloud-contract-shade/pom.xml # spring-cloud-contract-starters/pom.xml # spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml # spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml # spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml # spring-cloud-contract-stub-runner-boot/pom.xml # spring-cloud-contract-stub-runner/pom.xml # spring-cloud-contract-tools/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties # spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/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 # spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml # spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml # spring-cloud-contract-verifier/pom.xml # spring-cloud-contract-wiremock/pom.xml # tests/pom.xml # tests/samples-messaging-amqp/pom.xml # tests/samples-messaging-camel/pom.xml # tests/samples-messaging-integration/pom.xml # tests/samples-messaging-jms/pom.xml # tests/spring-cloud-contract-stub-runner-amqp/pom.xml # tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml # tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml # tests/spring-cloud-contract-stub-runner-context-path/pom.xml # tests/spring-cloud-contract-stub-runner-integration/pom.xml # tests/spring-cloud-contract-stub-runner-jms/pom.xml # tests/spring-cloud-contract-stub-runner-kafka/pom.xml # tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml # tests/spring-cloud-contract-stub-runner-moco/pom.xml # tests/spring-cloud-contract-stub-runner-stream/pom.xml
This commit is contained in:
Olga Maciaszek-Sharma
2
pom.xml
2
pom.xml
@@ -39,7 +39,7 @@
|
||||
<hoverfly-junit.version>0.2.2</hoverfly-junit.version>
|
||||
<commons-text.version>1.11.0</commons-text.version>
|
||||
<handlebars.version>4.3.1</handlebars.version>
|
||||
<jgit.version>6.8.0.202311291450-r</jgit.version>
|
||||
<jgit.version>6.10.1.202505221210-r</jgit.version>
|
||||
<javax-inject.version>1</javax-inject.version>
|
||||
<json-unit-assertj.version>2.38.0</json-unit-assertj.version>
|
||||
<rest-assured.version>5.2.1</rest-assured.version>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>4.3.1-SNAPSHOT</version>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>4.3.1-SNAPSHOT</version>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>4.3.1-SNAPSHOT</version>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>4.3.1-SNAPSHOT</version>
|
||||
<version>3.5.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
|
||||
Reference in New Issue
Block a user