From cc3c595ec41114eb738daaff634cb5c3aa45f5b4 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Tue, 14 Aug 2018 15:46:55 +0200
Subject: [PATCH] #391 - Assert compatibility with Lovelace RC1.

Upgrade from Lovelace M3 to Lovelace RC1 for examples requiring Lovelace. Upgrade to latest stable MongoDB drivers. Adapt to API changes. Un-pin examples that were previously bound to Spring Data Kay.
---
 jpa/jpa21/pom.xml                                         | 4 ----
 jpa/vavr/pom.xml                                          | 4 ++--
 mongodb/change-streams/pom.xml                            | 8 ++++----
 .../example/springdata/mongodb/ChangeStreamsTests.java    | 6 +++---
 mongodb/transactions/pom.xml                              | 8 ++++----
 pom.xml                                                   | 2 +-
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/jpa/jpa21/pom.xml b/jpa/jpa21/pom.xml
index 9feab38f..0e19f6d0 100644
--- a/jpa/jpa21/pom.xml
+++ b/jpa/jpa21/pom.xml
@@ -11,10 +11,6 @@
 	<artifactId>spring-data-jpa-jpa21</artifactId>
 	<name>Spring Data JPA - JPA 2.1 specific features</name>
 
-	<properties>
-		<spring-data-releasetrain.version>Kay-BUILD-SNAPSHOT</spring-data-releasetrain.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.hibernate</groupId>
diff --git a/jpa/vavr/pom.xml b/jpa/vavr/pom.xml
index 6f1aa235..d7cc3d36 100644
--- a/jpa/vavr/pom.xml
+++ b/jpa/vavr/pom.xml
@@ -10,9 +10,9 @@
 
 	<artifactId>spring-data-jpa-vavr</artifactId>
 	<name>Spring Data JPA - Vavr integration</name>
-	
+
 	<properties>
-		<spring-data-releasetrain.version>Lovelace-BUILD-SNAPSHOT</spring-data-releasetrain.version>
+		<spring-data-releasetrain.version>Lovelace-RC1</spring-data-releasetrain.version>
 	</properties>
 
 	<dependencies>
diff --git a/mongodb/change-streams/pom.xml b/mongodb/change-streams/pom.xml
index df181492..d9141ab4 100644
--- a/mongodb/change-streams/pom.xml
+++ b/mongodb/change-streams/pom.xml
@@ -12,9 +12,9 @@
 	<name>Spring Data MongoDB - Change Streams</name>
 
 	<properties>
-		<mongodb.version>3.8.0-beta2</mongodb.version>
-		<mongo-driver-reactivestreams.version>1.9.0-beta1</mongo-driver-reactivestreams.version>
-		<spring-data-releasetrain.version>Lovelace-M3</spring-data-releasetrain.version>
+		<mongodb.version>3.8.0</mongodb.version>
+		<mongo-driver-reactivestreams.version>1.9.0</mongo-driver-reactivestreams.version>
+		<spring-data-releasetrain.version>Lovelace-RC1</spring-data-releasetrain.version>
 	</properties>
 
 	<profiles>
@@ -24,7 +24,7 @@
 		<profile>
 			<id>spring-data-next</id>
 			<properties>
-				<spring-data-releasetrain.version>Lovelace-M3</spring-data-releasetrain.version>
+				<spring-data-releasetrain.version>Lovelace-RC1</spring-data-releasetrain.version>
 			</properties>
 		</profile>
 
diff --git a/mongodb/change-streams/src/test/java/example/springdata/mongodb/ChangeStreamsTests.java b/mongodb/change-streams/src/test/java/example/springdata/mongodb/ChangeStreamsTests.java
index 809ac651..b0a91e38 100644
--- a/mongodb/change-streams/src/test/java/example/springdata/mongodb/ChangeStreamsTests.java
+++ b/mongodb/change-streams/src/test/java/example/springdata/mongodb/ChangeStreamsTests.java
@@ -189,9 +189,9 @@ public class ChangeStreamsTests {
 	@Test
 	public void reactiveChangeEvents() {
 
-		Flux<ChangeStreamEvent<Person>> changeStream = reactiveTemplate.changeStream(
-				newAggregation(match(where("operationType").is("insert"))), Person.class, ChangeStreamOptions.empty(),
-				"person");
+		Flux<ChangeStreamEvent<Person>> changeStream = reactiveTemplate.changeStream("person",
+				ChangeStreamOptions.builder().filter(newAggregation(match(where("operationType").is("insert")))).build(),
+				Person.class);
 
 		StepVerifier.create(changeStream) //
 				.expectSubscription() //
diff --git a/mongodb/transactions/pom.xml b/mongodb/transactions/pom.xml
index 481ebbb0..e561e682 100644
--- a/mongodb/transactions/pom.xml
+++ b/mongodb/transactions/pom.xml
@@ -12,9 +12,9 @@
 	<name>Spring Data MongoDB - Transactions</name>
 
 	<properties>
-		<mongodb.version>3.8.0-beta2</mongodb.version>
-		<mongo-driver-reactivestreams.version>1.9.0-beta1</mongo-driver-reactivestreams.version>
-		<spring-data-releasetrain.version>Lovelace-M3</spring-data-releasetrain.version>
+		<mongodb.version>3.8.0</mongodb.version>
+		<mongo-driver-reactivestreams.version>1.9.0</mongo-driver-reactivestreams.version>
+		<spring-data-releasetrain.version>Lovelace-RC1</spring-data-releasetrain.version>
 	</properties>
 
 	<profiles>
@@ -24,7 +24,7 @@
 		<profile>
 			<id>spring-data-next</id>
 			<properties>
-				<spring-data-releasetrain.version>Lovelace-M3</spring-data-releasetrain.version>
+				<spring-data-releasetrain.version>Lovelace-RC1</spring-data-releasetrain.version>
 			</properties>
 		</profile>
 
diff --git a/pom.xml b/pom.xml
index e8fa6809..190765b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
 		<profile>
 			<id>spring-data-next-releasetrain-released</id>
 			<properties>
-				<spring-data-releasetrain.version>Lovelace-M3</spring-data-releasetrain.version>
+				<spring-data-releasetrain.version>Lovelace-RC1</spring-data-releasetrain.version>
 			</properties>
 		</profile>