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

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-01-19 09:35:31 +01:00
parent 038c4b34ba a5bdb32b7c
commit 643cbb2938
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/standalone/yml/http-client/pom.xml
View File

@@ -7,8 +7,8 @@
<artifactId>http-client-yml</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>Spring Cloud Contract Verifier Http Client Sample</name>
<description>Spring Cloud Contract Verifier Http Client Sample</description>
<name>Spring Cloud Contract Verifier Http Client YAML Sample</name>
<description>Spring Cloud Contract Verifier Http Client YAML Sample</description>
<parent>
<groupId>org.springframework.boot</groupId>

5
samples/standalone/yml/http-server/gradle.properties
View File

@@ -1,3 +1,8 @@
org.gradle.daemon=false
<<<<<<< HEAD
verifierVersion=2.0.0.BUILD-SNAPSHOT
BOM_VERSION=Finchley.BUILD-SNAPSHOT
=======
verifierVersion=1.2.3.BUILD-SNAPSHOT
BOM_VERSION=Edgware.BUILD-SNAPSHOT
>>>>>>> 1.2.x

9
samples/standalone/yml/http-server/pom.xml
View File

@@ -7,8 +7,8 @@
<artifactId>http-server-yml</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>Spring Cloud Contract Verifier Http Server Sample</name>
<description>Spring Cloud Contract Verifier Http Server Sample</description>
<name>Spring Cloud Contract Verifier Http Server YAML Sample</name>
<description>Spring Cloud Contract Verifier Http Server YAML Sample</description>
<parent>
<groupId>org.springframework.boot</groupId>
@@ -20,8 +20,13 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<<<<<<< HEAD
<spring-cloud-contract.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-dependencies.version>Finchley.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
=======
<spring-cloud-contract.version>1.2.3.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-dependencies.version>Edgware.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
>>>>>>> 1.2.x
</properties>
<dependencies>