Skip to content

Commit b1c8158

Browse files
committed
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
1 parent 41fb9cf commit b1c8158

File tree

3 files changed

+2
-18
lines changed

3 files changed

+2
-18
lines changed

Diff for: spring-boot-project/spring-boot-actuator/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ dependencies {
2929
}
3030
optional("io.r2dbc:r2dbc-pool")
3131
optional("io.r2dbc:r2dbc-spi")
32-
optional("io.reactivex:rxjava-reactive-streams")
3332
optional("io.undertow:undertow-servlet-jakarta") {
3433
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
3534
}

Diff for: spring-boot-project/spring-boot-dependencies/build.gradle

+2-16
Original file line numberDiff line numberDiff line change
@@ -1127,22 +1127,8 @@ bom {
11271127
]
11281128
}
11291129
}
1130-
library("RxJava", "1.3.8") {
1131-
group("io.reactivex") {
1132-
modules = [
1133-
"rxjava"
1134-
]
1135-
}
1136-
}
1137-
library("RxJava Adapter", "1.2.1") {
1138-
group("io.reactivex") {
1139-
modules = [
1140-
"rxjava-reactive-streams"
1141-
]
1142-
}
1143-
}
1144-
library("RxJava2", "2.2.21") {
1145-
group("io.reactivex.rxjava2") {
1130+
library("RxJava3", "3.1.3") {
1131+
group("io.reactivex.rxjava3") {
11461132
modules = [
11471133
"rxjava"
11481134
]

Diff for: spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ description = "Starter for using Couchbase document-oriented database and Spring
77
dependencies {
88
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
99
api("io.projectreactor:reactor-core")
10-
api("io.reactivex:rxjava-reactive-streams")
1110
api("org.springframework.data:spring-data-couchbase")
1211
}

0 commit comments

Comments
 (0)