From 28599e2d4370dcd8a716b91b8a9769bfcab3f64e Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Wed, 9 Jun 2021 13:58:56 -0400
Subject: [PATCH] Upgrade Versions

---
 helloworld/pom.xml                        |  4 ++--
 log4j2/pom.xml                            |  8 ++++----
 spring-rabbit-confirms-returns/pom.xml    |  6 +++---
 spring-rabbit-global-errorhandler/pom.xml |  6 +++---
 spring-rabbit-json/pom.xml                |  6 +++---
 spring-rabbit-stream-sample/HELP.md       | 15 +++++++++++++++
 stocks/pom.xml                            |  6 +++---
 7 files changed, 33 insertions(+), 18 deletions(-)
 create mode 100644 spring-rabbit-stream-sample/HELP.md

diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index 3989c62..8b055f6 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.samples.spring</groupId>
 	<artifactId>spring-rabbit-helloworld</artifactId>
-	<version>2.2.16.RELEASE</version>
+	<version>2.2.18.RELEASE</version>
 	<packaging>jar</packaging>
 	<name>Spring AMQP Hello World</name>
 	<url>https://www.spring.io</url>
@@ -16,7 +16,7 @@
 	</description>
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
-		<spring.amqp.version>2.2.16.RELEASE</spring.amqp.version>
+		<spring.amqp.version>2.2.18.RELEASE</spring.amqp.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<maven.test.failure.ignore>false</maven.test.failure.ignore>
diff --git a/log4j2/pom.xml b/log4j2/pom.xml
index fd42690..b743d13 100644
--- a/log4j2/pom.xml
+++ b/log4j2/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.amqp.samples</groupId>
 	<artifactId>log4j2</artifactId>
-	<version>2.2.16.RELEASE</version>
+	<version>2.2.18.RELEASE</version>
 	<packaging>jar</packaging>
 
 	<name>log4j2</name>
@@ -14,15 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.9.RELEASE</version>
+		<version>2.3.11.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring.framework.version>5.2.6.RELEASE</spring.framework.version>
-		<spring.amqp.version>2.2.16.RELEASE</spring.amqp.version>
+		<spring.framework.version>5.2.15.RELEASE</spring.framework.version>
+		<spring.amqp.version>2.2.18.RELEASE</spring.amqp.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-rabbit-confirms-returns/pom.xml b/spring-rabbit-confirms-returns/pom.xml
index c66231a..b880f09 100644
--- a/spring-rabbit-confirms-returns/pom.xml
+++ b/spring-rabbit-confirms-returns/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.amqp.samples</groupId>
 	<artifactId>spring-rabbit-confirms-returns</artifactId>
-	<version>2.2.16.RELEASE</version>
+	<version>2.2.18.RELEASE</version>
 	<packaging>jar</packaging>
 
 	<name>spring-rabbit-confirms-returns</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.9.RELEASE</version>
+		<version>2.3.11.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring.amqp.version>2.2.16.RELEASE</spring.amqp.version>
+		<spring.amqp.version>2.2.18.RELEASE</spring.amqp.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-rabbit-global-errorhandler/pom.xml b/spring-rabbit-global-errorhandler/pom.xml
index 3853fea..3d9a507 100644
--- a/spring-rabbit-global-errorhandler/pom.xml
+++ b/spring-rabbit-global-errorhandler/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.example</groupId>
 	<artifactId>spring-rabbit-global-errorhandler</artifactId>
-	<version>2.2.16.RELEASE</version>
+	<version>2.2.18.RELEASE</version>
 	<packaging>jar</packaging>
 
 	<name>spring-rabbit-global-errorhandler</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.9.RELEASE</version>
+		<version>2.3.11.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring.amqp.version>2.2.16.RELEASE</spring.amqp.version>
+		<spring.amqp.version>2.2.18.RELEASE</spring.amqp.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-rabbit-json/pom.xml b/spring-rabbit-json/pom.xml
index 4e0ca74..c22e320 100644
--- a/spring-rabbit-json/pom.xml
+++ b/spring-rabbit-json/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.example</groupId>
 	<artifactId>spring-rabbit-json</artifactId>
-	<version>2.2.16.RELEASE</version>
+	<version>2.2.18.RELEASE</version>
 	<packaging>jar</packaging>
 
 	<name>spring-rabbit-json</name>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.9.RELEASE</version>
+		<version>2.3.11.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring.amqp.version>2.2.16.RELEASE</spring.amqp.version>
+		<spring.amqp.version>2.2.18.RELEASE</spring.amqp.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-rabbit-stream-sample/HELP.md b/spring-rabbit-stream-sample/HELP.md
new file mode 100644
index 0000000..b162db0
--- /dev/null
+++ b/spring-rabbit-stream-sample/HELP.md
@@ -0,0 +1,15 @@
+# Getting Started
+
+### Reference Documentation
+For further reference, please consider the following sections:
+
+* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html)
+* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.5.1-SNAPSHOT/maven-plugin/reference/html/)
+* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.5.1-SNAPSHOT/maven-plugin/reference/html/#build-image)
+* [Spring for RabbitMQ](https://docs.spring.io/spring-boot/docs/2.5.0/reference/htmlsingle/#boot-features-amqp)
+
+### Guides
+The following guides illustrate how to use some features concretely:
+
+* [Messaging with RabbitMQ](https://spring.io/guides/gs/messaging-rabbitmq/)
+
diff --git a/stocks/pom.xml b/stocks/pom.xml
index 421ae41..f20ef7c 100644
--- a/stocks/pom.xml
+++ b/stocks/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.samples.spring</groupId>
 	<artifactId>spring-rabbit-stocks</artifactId>
-	<version>2.2.16.RELEASE</version>
+	<version>2.2.18.RELEASE</version>
 	<packaging>war</packaging>
 	<name>Spring Rabbit Stocks</name>
 	<url>https://www.spring.io</url>
@@ -15,8 +15,8 @@
 	</description>
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
-		<spring.framework.version>5.2.6.RELEASE</spring.framework.version>
-		<spring.amqp.version>2.2.16.RELEASE</spring.amqp.version>
+		<spring.framework.version>5.2.15.RELEASE</spring.framework.version>
+		<spring.amqp.version>2.2.18.RELEASE</spring.amqp.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<maven.test.failure.ignore>false</maven.test.failure.ignore>