From d3fddf59e08d261c44cb9a742e42ebbd03e0a632 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Mon, 18 Jul 2016 08:52:12 +0100
Subject: [PATCH] Rejig dependencies to make tests pass

---
 samples/standalone/stream-sink/pom.xml         |  4 ++--
 .../src/test/resources/application.yml         |  2 +-
 samples/standalone/stream-source/pom.xml       | 18 ++----------------
 .../pom.xml                                    |  4 +++-
 .../pom.xml                                    |  6 +++++-
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/samples/standalone/stream-sink/pom.xml b/samples/standalone/stream-sink/pom.xml
index 8d03967068..ffa5d92861 100644
--- a/samples/standalone/stream-sink/pom.xml
+++ b/samples/standalone/stream-sink/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.example</groupId>
-	<artifactId>contract-verifier-sample-stream-sink</artifactId>
+	<artifactId>stream-sink</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>Spring Cloud Contract Verifier Stream Sink Sample</name>
+	<name>Stream Sink Sample</name>
 	<description>Spring Cloud Contract Verifier Stream Sink Sample</description>
 
 	<parent>
diff --git a/samples/standalone/stream-sink/src/test/resources/application.yml b/samples/standalone/stream-sink/src/test/resources/application.yml
index 0f4fcfac65..f0d7e365c4 100644
--- a/samples/standalone/stream-sink/src/test/resources/application.yml
+++ b/samples/standalone/stream-sink/src/test/resources/application.yml
@@ -1,3 +1,3 @@
 stubrunner:
   work-offline: true
-  stubs.ids: 'com.example:contract-verifier-sample-stream-source'
\ No newline at end of file
+  stubs.ids: 'com.example:stream-source'
\ No newline at end of file
diff --git a/samples/standalone/stream-source/pom.xml b/samples/standalone/stream-source/pom.xml
index 53f2c02789..444e60ccc5 100644
--- a/samples/standalone/stream-source/pom.xml
+++ b/samples/standalone/stream-source/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.example</groupId>
-	<artifactId>contract-verifier-sample-stream-source</artifactId>
+	<artifactId>stream-source</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>Spring Cloud Contract Verifier Stream Source Sample</name>
+	<name>Stream Source Sample</name>
 	<description>Spring Cloud Contract Verifier Stream Source Sample</description>
 
 	<parent>
@@ -29,30 +29,16 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-contract-verifier-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier-stream</artifactId>
 			<scope>test</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 
 	<dependencyManagement>
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/pom.xml b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/pom.xml
index 316ccfaee4..159fc335b6 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/pom.xml
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
@@ -18,10 +18,12 @@
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
 		<dependency>
+			<!-- TODO: not needed here should be part of starter -->
 			<groupId>javax.inject</groupId>
 			<artifactId>javax.inject</artifactId>
 		</dependency>
 		<dependency>
+			<!-- TODO: optional? -->
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-test-autoconfigure</artifactId>
 		</dependency>
diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/pom.xml b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/pom.xml
index 997b05db18..179172893f 100644
--- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/pom.xml
+++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
@@ -29,5 +29,9 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.toomuchcoding.jsonassert</groupId>
+			<artifactId>jsonassert</artifactId>
+		</dependency>
 	</dependencies>
 </project>