From 4436342d5788a9c43bda7f5a286b1fcb142efa5d Mon Sep 17 00:00:00 2001
From: Ryan Schmitt <rschmitt@apache.org>
Date: Mon, 28 Jul 2025 15:50:04 -0700
Subject: [PATCH] Upgrade tests to RxJava 3

---
 httpclient5-testing/pom.xml                                 | 2 +-
 httpclient5/pom.xml                                         | 2 +-
 .../http/examples/ReactiveClientFullDuplexExchange.java     | 4 ++--
 .../hc/client5/http/examples/UnixDomainSocketAsync.java     | 2 +-
 pom.xml                                                     | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml
index d6125fe5b9..ffc73b9385 100644
--- a/httpclient5-testing/pom.xml
+++ b/httpclient5-testing/pom.xml
@@ -99,7 +99,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>io.reactivex.rxjava2</groupId>
+      <groupId>io.reactivex.rxjava3</groupId>
       <artifactId>rxjava</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/httpclient5/pom.xml b/httpclient5/pom.xml
index ff3992fd50..4a949d24fc 100644
--- a/httpclient5/pom.xml
+++ b/httpclient5/pom.xml
@@ -63,7 +63,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>io.reactivex.rxjava2</groupId>
+      <groupId>io.reactivex.rxjava3</groupId>
       <artifactId>rxjava</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ReactiveClientFullDuplexExchange.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ReactiveClientFullDuplexExchange.java
index e4fcf56448..f6b7f5b7ee 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ReactiveClientFullDuplexExchange.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ReactiveClientFullDuplexExchange.java
@@ -47,8 +47,8 @@
 import org.apache.hc.core5.reactor.IOReactorConfig;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.Flowable;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.Observable;
 
 /**
  * This example demonstrates a reactive, full-duplex HTTP/1.1 message exchange using RxJava.
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/UnixDomainSocketAsync.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/UnixDomainSocketAsync.java
index df6a14596c..65d873f287 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/UnixDomainSocketAsync.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/UnixDomainSocketAsync.java
@@ -26,7 +26,7 @@
  */
 package org.apache.hc.client5.http.examples;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
 import org.apache.hc.client5.http.async.methods.SimpleRequestProducer;
 import org.apache.hc.client5.http.config.RequestConfig;
diff --git a/pom.xml b/pom.xml
index f748421420..e15b97926f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
     <hamcrest.version>3.0</hamcrest.version>
     <mockito.version>4.11.0</mockito.version>
     <hc.stylecheck.version>1</hc.stylecheck.version>
-    <rxjava.version>2.2.21</rxjava.version>
+    <rxjava3.version>3.1.10</rxjava3.version>
     <testcontainers.version>1.21.3</testcontainers.version>
     <junixsocket.version>2.10.1</junixsocket.version>
     <api.comparison.version>5.3</api.comparison.version>
@@ -161,9 +161,9 @@
         <version>${memcached.version}</version>
       </dependency>
       <dependency>
-        <groupId>io.reactivex.rxjava2</groupId>
+        <groupId>io.reactivex.rxjava3</groupId>
         <artifactId>rxjava</artifactId>
-        <version>${rxjava.version}</version>
+        <version>${rxjava3.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>