From d8c3be530b8088598ea79756825c3556be75a9b5 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:58:51 +0200
Subject: [PATCH] [JAVA-26730] Upgraded io.projectreactor to latest version
 (#15234)

---
 aws-modules/aws-reactive/pom.xml                  |  3 +++
 core-java-modules/core-java-streams-4/pom.xml     |  4 ++--
 docker-modules/docker-containers/pom.xml          |  9 ++++++++-
 .../k8s-admission-controller/pom.xml              |  6 ++++++
 kubernetes-modules/kubernetes-spring/pom.xml      |  5 +++++
 libraries-http-2/pom.xml                          |  2 +-
 patterns-modules/axon/pom.xml                     |  3 +++
 .../spring-data-cassandra-reactive/pom.xml        |  3 +++
 .../spring-data-mongodb-reactive/pom.xml          |  5 +++--
 reactor-core/pom.xml                              |  5 +++--
 .../spring-boot-3-url-matching/pom.xml            |  4 ++--
 .../spring-cloud-netflix-sidecar-demo/pom.xml     |  4 ++++
 spring-reactive-modules/pom.xml                   | 15 +++++++++++++++
 .../spring-reactive-client-2/pom.xml              |  1 -
 .../spring-reactive-client/pom.xml                |  1 -
 .../spring-reactive-data-couchbase/pom.xml        |  2 --
 .../spring-reactive-data/pom.xml                  | 10 ++++++----
 .../spring-reactive-security/pom.xml              |  5 +++--
 spring-reactive-modules/spring-reactive/pom.xml   |  2 +-
 spring-reactive-modules/spring-reactor/pom.xml    |  7 ++++---
 spring-websockets/pom.xml                         |  2 ++
 21 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/aws-modules/aws-reactive/pom.xml b/aws-modules/aws-reactive/pom.xml
index 22bd62c2ee..965ce8fdcf 100644
--- a/aws-modules/aws-reactive/pom.xml
+++ b/aws-modules/aws-reactive/pom.xml
@@ -63,6 +63,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
+            <version>${reactor.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -93,6 +94,8 @@
     <properties>
         <spring.version>2.2.1.RELEASE</spring.version>
         <awssdk.version>2.17.283</awssdk.version>
+        <lombok.version>1.18.20</lombok.version>
+        <reactor.version>3.6.0</reactor.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-streams-4/pom.xml b/core-java-modules/core-java-streams-4/pom.xml
index e832cc1616..383f14d573 100644
--- a/core-java-modules/core-java-streams-4/pom.xml
+++ b/core-java-modules/core-java-streams-4/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>${io.reactor3.version}</version>
+            <version>${reactor-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -121,7 +121,7 @@
         <rx.java2.version>2.2.2</rx.java2.version>
         <rx.java3.version>3.1.5</rx.java3.version>
         <io.varv.version>1.0.0-alpha-4</io.varv.version>
-        <io.reactor3.version>3.5.1</io.reactor3.version>
+        <reactor-core.version>3.6.0</reactor-core.version>
         <apache.commons.collection4.version>4.4</apache.commons.collection4.version>
         <cyclops.version>10.4.1</cyclops.version>
     </properties>
diff --git a/docker-modules/docker-containers/pom.xml b/docker-modules/docker-containers/pom.xml
index 79bf0aee72..f8b903c87d 100644
--- a/docker-modules/docker-containers/pom.xml
+++ b/docker-modules/docker-containers/pom.xml
@@ -27,6 +27,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
+            <version>${reactor.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -45,7 +46,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>2.7.1</version>
+                <version>${jib-maven-plugin.version}</version>
                 <configuration>
                     <to>
                         <image>docker-demo-jib</image>
@@ -55,4 +56,10 @@
         </plugins>
     </build>
 
+    <properties>
+        <reactor.version>3.6.0</reactor.version>
+        <jib-maven-plugin.version>2.7.1</jib-maven-plugin.version>
+    </properties>
+
+
 </project>
\ No newline at end of file
diff --git a/kubernetes-modules/k8s-admission-controller/pom.xml b/kubernetes-modules/k8s-admission-controller/pom.xml
index 4c41bf7ca0..6a1d695f8d 100644
--- a/kubernetes-modules/k8s-admission-controller/pom.xml
+++ b/kubernetes-modules/k8s-admission-controller/pom.xml
@@ -33,6 +33,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
+            <version>${reactor.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -79,4 +80,9 @@
         </plugins>
     </build>
 
+    <properties>
+        <reactor.version>3.6.0</reactor.version>
+    </properties>
+
+
 </project>
\ No newline at end of file
diff --git a/kubernetes-modules/kubernetes-spring/pom.xml b/kubernetes-modules/kubernetes-spring/pom.xml
index 64322055d1..a9c780d59d 100644
--- a/kubernetes-modules/kubernetes-spring/pom.xml
+++ b/kubernetes-modules/kubernetes-spring/pom.xml
@@ -33,6 +33,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
+            <version>${reactor.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -46,4 +47,8 @@
         </plugins>
     </build>
 
+
+    <properties>
+        <reactor.version>3.6.0</reactor.version>
+    </properties>
 </project>
\ No newline at end of file
diff --git a/libraries-http-2/pom.xml b/libraries-http-2/pom.xml
index b49e4b9387..5e803cde8a 100644
--- a/libraries-http-2/pom.xml
+++ b/libraries-http-2/pom.xml
@@ -118,7 +118,7 @@
         <retrofit.version>2.3.0</retrofit.version>
         <spring.webflux.version>5.1.9.RELEASE</spring.webflux.version>
         <reactive.stream.version>1.0.3</reactive.stream.version>
-        <reactor.version>3.2.12.RELEASE</reactor.version>
+        <reactor.version>3.6.0</reactor.version>
         <jmockit.version>1.49</jmockit.version>
     </properties>
 
diff --git a/patterns-modules/axon/pom.xml b/patterns-modules/axon/pom.xml
index 473a1b0e15..4d83f8f9e6 100644
--- a/patterns-modules/axon/pom.xml
+++ b/patterns-modules/axon/pom.xml
@@ -51,6 +51,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
+            <version>${reactor.version}</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -70,6 +71,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
+            <version>${reactor.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -114,6 +116,7 @@
     <properties>
         <axon-bom.version>4.6.3</axon-bom.version>
         <de.flapdoodle.embed.mongo.version>3.4.8</de.flapdoodle.embed.mongo.version>
+        <reactor.version>3.6.0</reactor.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-cassandra-reactive/pom.xml b/persistence-modules/spring-data-cassandra-reactive/pom.xml
index cddb62186b..41f184e233 100644
--- a/persistence-modules/spring-data-cassandra-reactive/pom.xml
+++ b/persistence-modules/spring-data-cassandra-reactive/pom.xml
@@ -23,6 +23,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
+            <version>${reactor.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -45,6 +46,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
+            <version>${reactor.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -57,6 +59,7 @@
 
     <properties>
         <cassandra-unit-spring.version>4.3.1.0</cassandra-unit-spring.version>
+        <reactor.version>3.6.0</reactor.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-mongodb-reactive/pom.xml b/persistence-modules/spring-data-mongodb-reactive/pom.xml
index 46b2e8067f..ca45d4a758 100644
--- a/persistence-modules/spring-data-mongodb-reactive/pom.xml
+++ b/persistence-modules/spring-data-mongodb-reactive/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>${reactor-core.version}</version>
+            <version>${reactor.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -40,6 +40,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
+            <version>${reactor.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -126,7 +127,7 @@
     <properties>
         <spring-tx.version>5.3.15</spring-tx.version>
         <httpclient.version>4.5.2</httpclient.version>
-        <reactor-core.version>3.3.1.RELEASE</reactor-core.version>
+        <reactor.version>3.6.0</reactor.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/reactor-core/pom.xml b/reactor-core/pom.xml
index dd7533fe73..7bf34c93ad 100644
--- a/reactor-core/pom.xml
+++ b/reactor-core/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.projectreactor.addons</groupId>
             <artifactId>reactor-extra</artifactId>
-            <version>${reactor.version}</version>
+            <version>${reactor-extra.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -40,7 +40,8 @@
     </dependencies>
 
     <properties>
-        <reactor.version>3.5.1</reactor.version>
+        <reactor.version>3.6.0</reactor.version>
+        <reactor-extra.version>3.5.1</reactor-extra.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3-url-matching/pom.xml b/spring-boot-modules/spring-boot-3-url-matching/pom.xml
index 43f89eab47..42bd8583b3 100644
--- a/spring-boot-modules/spring-boot-3-url-matching/pom.xml
+++ b/spring-boot-modules/spring-boot-3-url-matching/pom.xml
@@ -96,8 +96,8 @@
     <properties>
         <spring-test.version>6.0.6</spring-test.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
-        <reactor-core.version>3.5.4</reactor-core.version>
-        <reactor-test.version>3.5.4></reactor-test.version>
+        <reactor-core.version>3.6.0</reactor-core.version>
+        <reactor-test.version>3.6.0></reactor-test.version>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
     </properties>
 
diff --git a/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/pom.xml b/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/pom.xml
index f8552aba93..60b68fc4bd 100644
--- a/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/pom.xml
+++ b/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/pom.xml
@@ -26,6 +26,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
+            <version>${reactor-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -53,4 +54,7 @@
         </plugins>
     </build>
 
+    <properties>
+        <reactor-core.version>3.6.0</reactor-core.version>
+    </properties>
 </project>
\ No newline at end of file
diff --git a/spring-reactive-modules/pom.xml b/spring-reactive-modules/pom.xml
index 61a3c3d17d..c349707027 100644
--- a/spring-reactive-modules/pom.xml
+++ b/spring-reactive-modules/pom.xml
@@ -59,7 +59,22 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>io.projectreactor</groupId>
+                <artifactId>reactor-core</artifactId>
+                <version>${reactor.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.projectreactor</groupId>
+                <artifactId>reactor-test</artifactId>
+                <version>${reactor.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
+    <properties>
+        <reactor.version>3.6.0</reactor.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-reactive-client-2/pom.xml b/spring-reactive-modules/spring-reactive-client-2/pom.xml
index 5d5f3ebc2e..f7d82053bb 100644
--- a/spring-reactive-modules/spring-reactive-client-2/pom.xml
+++ b/spring-reactive-modules/spring-reactive-client-2/pom.xml
@@ -135,7 +135,6 @@
     <properties>
         <reactor-spring.version>1.0.1.RELEASE</reactor-spring.version>
         <jetty-reactive-httpclient.version>1.1.6</jetty-reactive-httpclient.version>
-        <reactor-test.version>3.2.10.RELEASE</reactor-test.version>
         <resilience4j.version>1.7.1</resilience4j.version>
     </properties>
 
diff --git a/spring-reactive-modules/spring-reactive-client/pom.xml b/spring-reactive-modules/spring-reactive-client/pom.xml
index fe53584cc9..634fef1273 100644
--- a/spring-reactive-modules/spring-reactive-client/pom.xml
+++ b/spring-reactive-modules/spring-reactive-client/pom.xml
@@ -117,7 +117,6 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
-            <version>${reactor-test.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/spring-reactive-modules/spring-reactive-data-couchbase/pom.xml b/spring-reactive-modules/spring-reactive-data-couchbase/pom.xml
index e0b21087fa..84515fedeb 100644
--- a/spring-reactive-modules/spring-reactive-data-couchbase/pom.xml
+++ b/spring-reactive-modules/spring-reactive-data-couchbase/pom.xml
@@ -29,7 +29,6 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>${reactor-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -136,7 +135,6 @@
         <spring-tx.version>5.2.2.RELEASE</spring-tx.version>
         <httpclient.version>4.5.2</httpclient.version>
         <couchbaseMock.version>1.5.23</couchbaseMock.version>
-        <reactor-core.version>3.3.1.RELEASE</reactor-core.version>
         <!-- This spring-boot.version is set manually, For upgrading this please refer http://team.baeldung.com/browse/JAVA-2802 -->
         <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
         <log4j2.version>2.17.1</log4j2.version>
diff --git a/spring-reactive-modules/spring-reactive-data/pom.xml b/spring-reactive-modules/spring-reactive-data/pom.xml
index 576a1d9f86..d72072e419 100644
--- a/spring-reactive-modules/spring-reactive-data/pom.xml
+++ b/spring-reactive-modules/spring-reactive-data/pom.xml
@@ -13,9 +13,6 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
 
     <dependencies>
         <dependency>
@@ -63,7 +60,7 @@
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
-            <version>2.0.1.Final</version>
+            <version>${validation-api.version}</version>
         </dependency>
         <dependency>
             <groupId>io.r2dbc</groupId>
@@ -71,4 +68,9 @@
         </dependency>
     </dependencies>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <validation-api.version>2.0.1.Final</validation-api.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-reactive-security/pom.xml b/spring-reactive-modules/spring-reactive-security/pom.xml
index 25b9f4c38f..d501a03c46 100644
--- a/spring-reactive-modules/spring-reactive-security/pom.xml
+++ b/spring-reactive-modules/spring-reactive-security/pom.xml
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
-            <version>${project-reactor-test.version}</version>
+            <version>${reactor-test.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -115,7 +115,8 @@
         <johnzon.version>1.1.3</johnzon.version>
         <jsonb-api.version>1.0</jsonb-api.version>
         <geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
-        <project-reactor-test.version>3.1.6.RELEASE</project-reactor-test.version>
+        <reactor-test.version>3.1.6.RELEASE</reactor-test.version>
+        <reactor.version>3.4.29</reactor.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-reactive/pom.xml b/spring-reactive-modules/spring-reactive/pom.xml
index f19809e302..04bd32d632 100644
--- a/spring-reactive-modules/spring-reactive/pom.xml
+++ b/spring-reactive-modules/spring-reactive/pom.xml
@@ -104,7 +104,7 @@
     </build>
 
     <properties>
-        <reactor.version>3.4.16</reactor.version>
+        <reactor.version>3.6.0</reactor.version>
         <reactor-kafka.version>1.3.10</reactor-kafka.version>
         <rxjava.version>2.2.21</rxjava.version>
     </properties>
diff --git a/spring-reactive-modules/spring-reactor/pom.xml b/spring-reactive-modules/spring-reactor/pom.xml
index c2635765f0..54a97b92de 100644
--- a/spring-reactive-modules/spring-reactor/pom.xml
+++ b/spring-reactive-modules/spring-reactor/pom.xml
@@ -27,17 +27,18 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-bus</artifactId>
-            <version>${reactor.version}</version>
+            <version>${reactor-bus.version}</version>
         </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>${reactor.version}</version>
+            <version>${reactor-core.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
-        <reactor.version>2.0.8.RELEASE</reactor.version>
+        <reactor-bus.version>2.0.8.RELEASE</reactor-bus.version>
+        <reactor-core.version>2.0.8.RELEASE</reactor-core.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-websockets/pom.xml b/spring-websockets/pom.xml
index 6ca84c4946..d6c5fbe561 100644
--- a/spring-websockets/pom.xml
+++ b/spring-websockets/pom.xml
@@ -22,6 +22,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
+            <version>${reactor-core.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.javafaker</groupId>
@@ -45,6 +46,7 @@
     </build>
 
     <properties>
+        <reactor-core.version>3.6.0</reactor-core.version>
         <javafaker.version>1.0.2</javafaker.version>
     </properties>