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

Merge branch '2.2.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-12-01 13:35:17 +01:00
parent d8f6e17af5 de8333deed
commit 3305ee31b3
5 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-cloud-contract-dependencies/pom.xml
View File

@@ -16,7 +16,7 @@
<description>Spring Cloud Contract Dependencies</description>
<properties>
<wiremock.version>2.27.1</wiremock.version>
<jsonassert.version>0.4.14</jsonassert.version>
<jsonassert.version>0.5.0</jsonassert.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -105,10 +105,23 @@
<artifactId>wiremock-jre8-standalone</artifactId>
<version>${wiremock.version}</version>
</dependency>
<!-- Leaving this for backward compatibility -->
<dependency>
<groupId>com.toomuchcoding.jsonassert</groupId>
<artifactId>jsonassert</artifactId>
<version>${jsonassert.version}</version>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- This has shadowed deps -->
<dependency>
<groupId>com.toomuchcoding.jsonassert</groupId>
<artifactId>jsonassert-shade</artifactId>
<version>${jsonassert.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

6
spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml
View File

@@ -49,6 +49,12 @@
<dependency>
<groupId>com.toomuchcoding.jsonassert</groupId>
<artifactId>jsonassert</artifactId>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>cglib</groupId>

8
spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml
View File

@@ -64,8 +64,14 @@
<dependency>
<groupId>com.toomuchcoding.jsonassert</groupId>
<artifactId>jsonassert</artifactId>
<version>0.4.13</version>
<version>0.5.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.assertj</groupId>

8
spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml
View File

@@ -63,8 +63,14 @@
<dependency>
<groupId>com.toomuchcoding.jsonassert</groupId>
<artifactId>jsonassert</artifactId>
<version>0.4.13</version>
<version>0.5.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.assertj</groupId>

6
spring-cloud-contract-verifier/pom.xml
View File

@@ -113,6 +113,12 @@
<dependency>
<groupId>com.toomuchcoding.jsonassert</groupId>
<artifactId>jsonassert</artifactId>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>