From 1398ae66f1cf5c055ed613f0ce66bc61d3c9cfb9 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Tue, 9 Aug 2016 17:55:21 +0200
Subject: [PATCH] Trying to fix build

---
 samples/standalone/dsl/http-client/gradle.properties     | 2 +-
 samples/standalone/dsl/http-server/gradle.properties     | 2 +-
 .../standalone/restdocs/http-client/gradle.properties    | 2 +-
 .../standalone/restdocs/http-server/gradle.properties    | 2 +-
 samples/standalone/stream-sink/gradle.properties         | 2 +-
 samples/standalone/stream-sink/pom.xml                   | 9 ++++++++-
 samples/standalone/stream-source/gradle.properties       | 2 +-
 samples/standalone/stream-source/pom.xml                 | 2 +-
 8 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/samples/standalone/dsl/http-client/gradle.properties b/samples/standalone/dsl/http-client/gradle.properties
index 004e3e550a..fc29ae128a 100644
--- a/samples/standalone/dsl/http-client/gradle.properties
+++ b/samples/standalone/dsl/http-client/gradle.properties
@@ -1,2 +1,2 @@
 verifierVersion=1.0.0.BUILD-SNAPSHOT
-BOM_VERSION=Brixton.SR3
\ No newline at end of file
+BOM_VERSION=Brixton.SR4
\ No newline at end of file
diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties
index 004e3e550a..fc29ae128a 100644
--- a/samples/standalone/dsl/http-server/gradle.properties
+++ b/samples/standalone/dsl/http-server/gradle.properties
@@ -1,2 +1,2 @@
 verifierVersion=1.0.0.BUILD-SNAPSHOT
-BOM_VERSION=Brixton.SR3
\ No newline at end of file
+BOM_VERSION=Brixton.SR4
\ No newline at end of file
diff --git a/samples/standalone/restdocs/http-client/gradle.properties b/samples/standalone/restdocs/http-client/gradle.properties
index 004e3e550a..fc29ae128a 100644
--- a/samples/standalone/restdocs/http-client/gradle.properties
+++ b/samples/standalone/restdocs/http-client/gradle.properties
@@ -1,2 +1,2 @@
 verifierVersion=1.0.0.BUILD-SNAPSHOT
-BOM_VERSION=Brixton.SR3
\ No newline at end of file
+BOM_VERSION=Brixton.SR4
\ No newline at end of file
diff --git a/samples/standalone/restdocs/http-server/gradle.properties b/samples/standalone/restdocs/http-server/gradle.properties
index 004e3e550a..fc29ae128a 100644
--- a/samples/standalone/restdocs/http-server/gradle.properties
+++ b/samples/standalone/restdocs/http-server/gradle.properties
@@ -1,2 +1,2 @@
 verifierVersion=1.0.0.BUILD-SNAPSHOT
-BOM_VERSION=Brixton.SR3
\ No newline at end of file
+BOM_VERSION=Brixton.SR4
\ No newline at end of file
diff --git a/samples/standalone/stream-sink/gradle.properties b/samples/standalone/stream-sink/gradle.properties
index 004e3e550a..fc29ae128a 100644
--- a/samples/standalone/stream-sink/gradle.properties
+++ b/samples/standalone/stream-sink/gradle.properties
@@ -1,2 +1,2 @@
 verifierVersion=1.0.0.BUILD-SNAPSHOT
-BOM_VERSION=Brixton.SR3
\ No newline at end of file
+BOM_VERSION=Brixton.SR4
\ No newline at end of file
diff --git a/samples/standalone/stream-sink/pom.xml b/samples/standalone/stream-sink/pom.xml
index a9ce478177..b0003b8aff 100644
--- a/samples/standalone/stream-sink/pom.xml
+++ b/samples/standalone/stream-sink/pom.xml
@@ -45,6 +45,13 @@
 			<artifactId>spring-cloud-stream-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<!-- ENFORCING BUILD ORDER -->
+		<dependency>
+			<groupId>com.example</groupId>
+			<artifactId>stream-source</artifactId>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>
@@ -59,7 +66,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Brixton.SR3</version>
+				<version>Brixton.SR4</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/samples/standalone/stream-source/gradle.properties b/samples/standalone/stream-source/gradle.properties
index 004e3e550a..fc29ae128a 100644
--- a/samples/standalone/stream-source/gradle.properties
+++ b/samples/standalone/stream-source/gradle.properties
@@ -1,2 +1,2 @@
 verifierVersion=1.0.0.BUILD-SNAPSHOT
-BOM_VERSION=Brixton.SR3
\ No newline at end of file
+BOM_VERSION=Brixton.SR4
\ No newline at end of file
diff --git a/samples/standalone/stream-source/pom.xml b/samples/standalone/stream-source/pom.xml
index 92d19dfd06..e2a0b9244b 100644
--- a/samples/standalone/stream-source/pom.xml
+++ b/samples/standalone/stream-source/pom.xml
@@ -58,7 +58,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Brixton.SR3</version>
+				<version>Brixton.SR4</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>