From e1b202171d733422e0eda739380d44001bbf6f1e Mon Sep 17 00:00:00 2001
From: Greg Stroup <gstroup@gmail.com>
Date: Fri, 3 Feb 2023 11:57:45 -0800
Subject: [PATCH] Fix kinesis demo (#187)

* Update to Spring Cloud to `2021.0.5`
* Update spring-cloud-stream-binder-kinesis to `2.2.0`
* Update Spring Boot to `2.7.8`
* Remove repo.spring.io from pom.xml
---
 .../kinesisdemo/kinesisconsumer/pom.xml       |  4 +-
 .../KinesisconsumerApplicationTests.java      |  5 +--
 .../kinesisdemo/kinesisproducer/pom.xml       |  4 +-
 .../KinesisdemoApplicationTests.java          |  5 +--
 dataflow-website/recipes/kinesisdemo/pom.xml  | 45 +------------------
 5 files changed, 7 insertions(+), 56 deletions(-)

diff --git a/dataflow-website/recipes/kinesisdemo/kinesisconsumer/pom.xml b/dataflow-website/recipes/kinesisdemo/kinesisconsumer/pom.xml
index d2572e3..7478ee9 100644
--- a/dataflow-website/recipes/kinesisdemo/kinesisconsumer/pom.xml
+++ b/dataflow-website/recipes/kinesisdemo/kinesisconsumer/pom.xml
@@ -15,7 +15,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+		<spring-cloud.version>2021.0.5</spring-cloud.version>
 	</properties>
 
 	<dependencies>
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-kinesis</artifactId>
-			<version>1.2.0.RELEASE</version>
+			<version>2.2.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/dataflow-website/recipes/kinesisdemo/kinesisconsumer/src/test/java/com/example/kinesisconsumer/KinesisconsumerApplicationTests.java b/dataflow-website/recipes/kinesisdemo/kinesisconsumer/src/test/java/com/example/kinesisconsumer/KinesisconsumerApplicationTests.java
index 1c4f003..1e92292 100644
--- a/dataflow-website/recipes/kinesisdemo/kinesisconsumer/src/test/java/com/example/kinesisconsumer/KinesisconsumerApplicationTests.java
+++ b/dataflow-website/recipes/kinesisdemo/kinesisconsumer/src/test/java/com/example/kinesisconsumer/KinesisconsumerApplicationTests.java
@@ -1,11 +1,8 @@
 package com.example.kinesisconsumer;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
 public class KinesisconsumerApplicationTests {
 
diff --git a/dataflow-website/recipes/kinesisdemo/kinesisproducer/pom.xml b/dataflow-website/recipes/kinesisdemo/kinesisproducer/pom.xml
index 5b877c3..5c2834d 100644
--- a/dataflow-website/recipes/kinesisdemo/kinesisproducer/pom.xml
+++ b/dataflow-website/recipes/kinesisdemo/kinesisproducer/pom.xml
@@ -15,7 +15,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+		<spring-cloud.version>2021.0.5</spring-cloud.version>
 	</properties>
 
 	<dependencies>
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-kinesis</artifactId>
-			<version>1.2.0.RELEASE</version>
+			<version>2.2.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/dataflow-website/recipes/kinesisdemo/kinesisproducer/src/test/java/com/example/kinesisdemo/KinesisdemoApplicationTests.java b/dataflow-website/recipes/kinesisdemo/kinesisproducer/src/test/java/com/example/kinesisdemo/KinesisdemoApplicationTests.java
index 8e90cb5..f00d16e 100644
--- a/dataflow-website/recipes/kinesisdemo/kinesisproducer/src/test/java/com/example/kinesisdemo/KinesisdemoApplicationTests.java
+++ b/dataflow-website/recipes/kinesisdemo/kinesisproducer/src/test/java/com/example/kinesisdemo/KinesisdemoApplicationTests.java
@@ -1,11 +1,8 @@
 package com.example.kinesisdemo;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
 public class KinesisdemoApplicationTests {
 
diff --git a/dataflow-website/recipes/kinesisdemo/pom.xml b/dataflow-website/recipes/kinesisdemo/pom.xml
index 3c38d19..b8c9358 100644
--- a/dataflow-website/recipes/kinesisdemo/pom.xml
+++ b/dataflow-website/recipes/kinesisdemo/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.6.RELEASE</version>
+		<version>2.7.8</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -51,47 +51,4 @@
 		</plugins>
 	</build>
 
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/libs-snapshot-local</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/libs-milestone-local</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/libs-snapshot-local</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/libs-milestone-local</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-
 </project>