Merge branch '3.1.x'

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

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>