Skip to content

Commit 4b9db72

Browse files
committed
Drop RxJava 2
RxJava 2 is end-of-life as of February 28, 2021. `ReactiveTestUtils` can probably be dropped for 5.6 in favor of `Reactive3TestUtils`.
1 parent 78e0311 commit 4b9db72

File tree

3 files changed

+4
-167
lines changed

3 files changed

+4
-167
lines changed

httpcore5-testing/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@
6060
<groupId>org.slf4j</groupId>
6161
<artifactId>slf4j-api</artifactId>
6262
</dependency>
63-
<dependency>
64-
<groupId>io.reactivex.rxjava2</groupId>
65-
<artifactId>rxjava</artifactId>
66-
<version>${rxjava.version}</version>
67-
</dependency>
6863
<dependency>
6964
<groupId>io.reactivex.rxjava3</groupId>
7065
<artifactId>rxjava</artifactId>
@@ -161,4 +156,4 @@
161156
</plugins>
162157
</reporting>
163158

164-
</project>
159+
</project>

httpcore5-testing/src/main/java/org/apache/hc/core5/testing/reactive/ReactiveTestUtils.java

Lines changed: 0 additions & 158 deletions
This file was deleted.

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
<mockito.version>4.11.0</mockito.version>
7979
<slf4j.version>1.7.36</slf4j.version>
8080
<log4j.version>2.25.0</log4j.version>
81-
<rxjava.version>2.2.21</rxjava.version>
8281
<rxjava3.version>3.1.10</rxjava3.version>
8382
<testcontainers.version>1.21.3</testcontainers.version>
8483
<api.comparison.version>5.3</api.comparison.version>
@@ -232,6 +231,7 @@
232231
<parameter>
233232
<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
234233
<breakBuildOnSourceIncompatibleModifications>true</breakBuildOnSourceIncompatibleModifications>
234+
<ignoreMissingClasses>true</ignoreMissingClasses>
235235
<overrideCompatibilityChangeParameters>
236236
<overrideCompatibilityChangeParameter>
237237
<compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
@@ -241,6 +241,7 @@
241241
</overrideCompatibilityChangeParameters>
242242
<excludes>
243243
<exclude>@org.apache.hc.core5.annotation.Internal</exclude>
244+
<exclude>org.apache.hc.core5.testing.reactive.ReactiveTestUtils</exclude>
244245
</excludes>
245246
</parameter>
246247
</configuration>
@@ -369,7 +370,6 @@
369370
<excludes>
370371
<exclude>@org.apache.hc.core5.annotation.Internal</exclude>
371372
</excludes>
372-
<ignoreMissingClasses>true</ignoreMissingClasses>
373373
</parameter>
374374
</configuration>
375375
</plugin>
@@ -382,4 +382,4 @@
382382
</plugins>
383383
</reporting>
384384

385-
</project>
385+
</project>

0 commit comments

Comments
 (0)