SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-06-14 13:46:32 +02:00
parent fa698f8e94
commit 1ed9002b2f
7 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/standalone/dsl/http-server/pom.xml
View File

@@ -20,14 +20,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<<<<<<< HEAD
<java.version>17</java.version>
<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
=======
<java.version>1.8</java.version>
<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-release.version>2021.0.3-SNAPSHOT</spring-cloud-release.version>
>>>>>>> 3.1.x
</properties>
<dependencies>

5
samples/standalone/restdocs/http-client/pom.xml
View File

@@ -37,14 +37,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<<<<<<< HEAD
<java.version>17</java.version>
<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
<rest-assured.version>5.0.2-SNAPSHOT</rest-assured.version>
=======
<java.version>1.8</java.version>
<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
>>>>>>> 3.1.x
</properties>
<dependencies>

5
samples/standalone/restdocs/http-server/pom.xml
View File

@@ -20,13 +20,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<<<<<<< HEAD
<java.version>17</java.version>
<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
=======
<java.version>1.8</java.version>
<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
>>>>>>> 3.1.x
<spring.cloud.contract.verifier.jar.skip>true
</spring.cloud.contract.verifier.jar.skip>
<rest-assured.version>5.0.2-SNAPSHOT</rest-assured.version>

8
samples/standalone/restdocs/pom.xml
View File

@@ -7,11 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-samples-standalone</artifactId>
<<<<<<< HEAD
<version>4.0.0-SNAPSHOT</version>
=======
<version>3.1.4-SNAPSHOT</version>
>>>>>>> 3.1.x
<relativePath>..</relativePath>
</parent>
@@ -23,12 +19,8 @@
</description>
<properties>
<<<<<<< HEAD
<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
<skipTests>true</skipTests>
=======
<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
>>>>>>> 3.1.x
</properties>
<modules>

5
samples/standalone/webclient/http-client/pom.xml
View File

@@ -20,13 +20,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<<<<<<< HEAD
<java.version>17</java.version>
<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
=======
<java.version>1.8</java.version>
<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
>>>>>>> 3.1.x
</properties>
<dependencies>

5
samples/standalone/webclient/http-server/pom.xml
View File

@@ -20,13 +20,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<<<<<<< HEAD
<java.version>17</java.version>
<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
=======
<java.version>1.8</java.version>
<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
>>>>>>> 3.1.x
</properties>
<dependencies>

8
samples/standalone/webclient/pom.xml
View File

@@ -7,11 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-samples-standalone</artifactId>
<<<<<<< HEAD
<version>4.0.0-SNAPSHOT</version>
=======
<version>3.1.4-SNAPSHOT</version>
>>>>>>> 3.1.x
<relativePath>..</relativePath>
</parent>
@@ -23,11 +19,7 @@
</description>
<properties>
<<<<<<< HEAD
<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
=======
<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
>>>>>>> 3.1.x
</properties>
<modules>