From b1c815830fea7a4dd42c6805fbfd86ce3bad0b35 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Tue, 1 Feb 2022 11:36:58 +0100
Subject: [PATCH] Upgrade to RxJava 3.x and remove older generations

As Spring Framework removed support for RxJava 1.x and 2.x, we should do
the same and only provide dependency management for RxJava 3.x.

Closes gh-28212
---
 .../spring-boot-actuator/build.gradle          |  1 -
 .../spring-boot-dependencies/build.gradle      | 18 ++----------------
 .../build.gradle                               |  1 -
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator/build.gradle b/spring-boot-project/spring-boot-actuator/build.gradle
index 57e9b49672c..9192e659ab9 100644
--- a/spring-boot-project/spring-boot-actuator/build.gradle
+++ b/spring-boot-project/spring-boot-actuator/build.gradle
@@ -29,7 +29,6 @@ dependencies {
 	}
 	optional("io.r2dbc:r2dbc-pool")
 	optional("io.r2dbc:r2dbc-spi")
-	optional("io.reactivex:rxjava-reactive-streams")
 	optional("io.undertow:undertow-servlet-jakarta") {
 		exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
 	}
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index 1b1cf1a42d2..675d27c898f 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1127,22 +1127,8 @@ bom {
 			]
 		}
 	}
-	library("RxJava", "1.3.8") {
-		group("io.reactivex") {
-			modules = [
-				"rxjava"
-			]
-		}
-	}
-	library("RxJava Adapter", "1.2.1") {
-		group("io.reactivex") {
-			modules = [
-				"rxjava-reactive-streams"
-			]
-		}
-	}
-	library("RxJava2", "2.2.21") {
-		group("io.reactivex.rxjava2") {
+	library("RxJava3", "3.1.3") {
+		group("io.reactivex.rxjava3") {
 			modules = [
 				"rxjava"
 			]
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle
index ec8c533472e..3ae4f9bf008 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle
@@ -7,6 +7,5 @@ description = "Starter for using Couchbase document-oriented database and Spring
 dependencies {
 	api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
 	api("io.projectreactor:reactor-core")
-	api("io.reactivex:rxjava-reactive-streams")
 	api("org.springframework.data:spring-data-couchbase")
 }