feat: update libraries, migrate to RxJava3

.circleci/config.yml

@@ -151,6 +151,23 @@ jobs:
             chmod +x ./codecov
             ./codecov
 
+  check-dependencies:
+    parameters:
+      maven-image:
+        type: string
+        default: *default-maven-image
+    docker:
+      - image: << parameters.maven-image >>
+    steps:
+      - checkout
+      - restore_cache:
+          name: Restoring Maven Cache
+          keys:
+            - maven-cache_v3-<< parameters.maven-image >>-
+      - run:
+          name: "Check dependency rules"
+          command: mvn enforcer:enforce -Drules=banDuplicatePomDependencyVersions,dependencyConvergence
+
   deploy-snapshot:
     docker:
       - image: *default-maven-image
@@ -193,6 +210,7 @@ workflows:
   version: 2
   build:
     jobs:
+      - check-dependencies
       - tests-java:
           name: jdk-8
       - tests-java:
@@ -209,8 +227,10 @@ workflows:
           junit-tests: "-DclientBenchmark=true -Dit.test=com.influxdb.client.ITBenchmarkTest -DfailIfNoTests=false -Dtest=ignore -DwildcardSuites=ignore"
       - deploy-snapshot:
           requires:
+            - check-dependencies
             - jdk-8
             - jdk-11
+            - jdk-17
             - jdk-8-nightly
           filters:
             branches:

.gitignore

@@ -15,4 +15,8 @@ tree.txt
 **/.openapi-generator*
 **/swagger2.yml
 **/response.json
-**/test.txt
+**/test.txt
+
+# Mac OS
+.DS_Store
+client/.DS_Store

CHANGELOG.md

@@ -1,9 +1,55 @@
-## 5.1.0 [unreleased]
+## 6.0.0 [unreleased]
+
+### Migration Notice
+:warning: The InfluxDB Client Library uses internally `RxJava` to support write with batching, retry and backpressure.
+ The underlying outdated `RxJava2` library was upgraded to the latest `RxJava3`.
+
+- see [What is different in RxJava3](https://github.com/ReactiveX/RxJava/wiki/What's-different-in-3.0)
+
+
+### Changes in public API
+
+  - `WriteService` imports:
+    - `io.reactivex.Single` is refactored to `io.reactivex.rxjava3.core.Single`
+  - `WriteOptions` imports:
+    - `io.reactivex.BackpressureOverflowStrategy` -> `io.reactivex.rxjava3.core.BackpressureOverflowStrategy`
+    - `io.reactivex.Scheduler` -> `io.reactivex.rxjava3.core.Scheduler`
+    - `io.reactivex.schedulers.Schedulers` -> `io.reactivex.rxjava3.schedulers.Schedulers`
+  - `InfluxDBClientReactive`:
+    - `Single<HealthCheck> health()` -> `Publisher<HealthCheck> health()`
+  - `WriteOptionsReactive`
+     - `io.reactivex.Scheduler` -> `io.reactivex.rxjava3.core.Scheduler`
+     - `io.reactivex.schedulers.Schedulers` -> `io.reactivex.rxjava3.schedulers.Schedulers`
+
+
+### List of updated dependencies: 
+ - Core:
+    - com.squareup.okhttp3:okhttp:jar:4.9.3 
+    - com.squareup.okio:okio:jar:2.10.0
+    - com.google.code.gson:gson:jar:2.9.0
+    - io.reactivex.rxjava3:rxjava:jar:3.1.4
+    - org.apache.commons:commons-csv:jar 1.9.0
+    - io.gsonfire:gson-fire:1.8.5
+ - Kotlin
+   - org.jetbrains.kotlin:kotlin-stdlib:1.6.20
+   - org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3
+   - org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0
+ - Karaf
+   - karaf 4.3.6
+   - gson-fire 1.8.5
+ - Micrometer 
+   - micrometer 1.8.4
+ - OSGi
+   - org.osgi:osgi.core:8.0.0
+ - Spring integration
+   - org.springframework.boot:spring-boot:jar:2.6.6
+   - org.springframework:spring-core:jar:5.3.17
 
 ### Features
+1. [#289](https://github.com/influxdata/influxdb-client-java/pull/298): Upgrade `RxJava2` -> `RxJava3`, update outdated dependencies
 1. [#316](https://github.com/influxdata/influxdb-client-java/pull/316): Add `InvocableScriptsApi` to create, update, list, delete and invoke scripts by seamless way
 1. [#315](https://github.com/influxdata/influxdb-client-java/pull/315): Add support for timezones [FluxDSL]
-1. [#317](https://github.com/influxdata/influxdb-client-java/pull/317): Gets HTTP headers from the unsuccessful HTTP request
+1. [#317](https://github.com/influxdata/influxdb-client-java/pull/317): Gets HTTP headers from the unsuccessful HTTP reques
 
 ### Bug Fixes
 1. [#313](https://github.com/influxdata/influxdb-client-java/pull/313): Do not deliver `exception` when the consumer is already disposed [influxdb-client-reactive]

client-core/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <artifactId>influxdb-client</artifactId>
         <groupId>com.influxdb</groupId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>influxdb-client-core</artifactId>
@@ -65,7 +65,7 @@
     <scm>
         <connection>scm:git:[email protected]:influxdata/influxdb-client-java.git</connection>
         <developerConnection>scm:git:[email protected]:influxdata/influxdb-client-java.git</developerConnection>
-        <url>http://github.com/influxdata/influxdb-client-java/tree/master</url>
+        <url>https://github.com/influxdata/influxdb-client-java/tree/master</url>
       <tag>HEAD</tag>
   </scm>
 
@@ -98,6 +98,16 @@
         <dependency>
             <groupId>com.squareup.okio</groupId>
             <artifactId>okio</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -152,6 +162,12 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
             <scope>test</scope>
         </dependency>
 

client-kotlin/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <artifactId>influxdb-client</artifactId>
         <groupId>com.influxdb</groupId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -71,7 +71,7 @@
     <scm>
         <connection>scm:git:[email protected]:influxdata/influxdb-client-java.git</connection>
         <developerConnection>scm:git:[email protected]:influxdata/influxdb-client-java.git</developerConnection>
-        <url>http://github.com/influxdata/influxdb-client-java/tree/master</url>
+        <url>https://github.com/influxdata/influxdb-client-java/tree/master</url>
       <tag>HEAD</tag>
   </scm>
 
@@ -176,17 +176,39 @@
             <artifactId>kotlin-stdlib</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-core-jvm</artifactId>
+            <version>1.4.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-common</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>
             <artifactId>kotlinx-coroutines-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlinx</groupId>
+                    <artifactId>kotlinx-coroutines-core-jvm</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>com.willowtreeapps.assertk</groupId>
             <artifactId>assertk-jvm</artifactId>
-            <version>0.22</version>
+            <version>0.25</version>
             <scope>test</scope>
             <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-common</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.jetbrains.kotlin</groupId>
                     <artifactId>kotlin-stdlib-jdk8</artifactId>

client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt

@@ -42,7 +42,6 @@ import com.influxdb.client.domain.PermissionResource
 import com.influxdb.client.domain.Query
 import com.influxdb.client.domain.WritePrecision
 import com.influxdb.client.internal.AbstractInfluxDBClient
-import kotlinx.coroutines.channels.map
 import kotlinx.coroutines.channels.toList
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.BeforeEach
@@ -236,7 +235,7 @@ internal class ITQueryKotlinApi : AbstractITInfluxDBClientKotlin() {
 
         val records = queryKotlinApi.query(flux, organization.id)
 
-        val values = records.map { it.value }.toList()
+        val values = records.toList().map { it.value }
 
         assertThat(values).hasSize(2)
         assertThat(values).containsExactly(10L, 11L)

client-legacy/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.influxdb</groupId>
         <artifactId>influxdb-client</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>influxdb-client-flux</artifactId>
@@ -65,7 +65,7 @@
     <scm>
         <connection>scm:git:[email protected]:influxdata/influxdb-client-java.git</connection>
         <developerConnection>scm:git:[email protected]:influxdata/influxdb-client-java.git</developerConnection>
-        <url>http://github.com/influxdata/influxdb-client-java/tree/master</url>
+        <url>https://github.com/influxdata/influxdb-client-java/tree/master</url>
       <tag>HEAD</tag>
   </scm>
 

client-osgi/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <artifactId>influxdb-client</artifactId>
         <groupId>com.influxdb</groupId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>influxdb-client-osgi</artifactId>
@@ -53,7 +53,7 @@
         <developer>
             <name>József Börcsök</name>
             <email>[email protected]</email>
-            <url>http://www.github.com/borcsokj</url>
+            <url>https://www.github.com/borcsokj</url>
         </developer>
     </developers>
 
@@ -64,7 +64,7 @@
     <scm>
         <connection>scm:git:[email protected]:influxdata/influxdb-client-java.git</connection>
         <developerConnection>scm:git:[email protected]:influxdata/influxdb-client-java.git</developerConnection>
-        <url>http://github.com/influxdata/influxdb-client-java/tree/master</url>
+        <url>https://github.com/influxdata/influxdb-client-java/tree/master</url>
         <tag>HEAD</tag>
     </scm>
 
@@ -144,41 +144,41 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.20</version>
+            <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
+            <version>1.7.36</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.core</artifactId>
-            <version>6.0.0</version>
+            <version>8.0.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.cmpn</artifactId>
-            <version>6.0.0</version>
+            <version>7.0.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.component.annotations</artifactId>
-            <version>1.3.0</version>
+            <version>1.5.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.metatype.annotations</artifactId>
-            <version>1.3.0</version>
+            <version>1.4.1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -191,8 +191,14 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>1.2.11</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

client-reactive/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <artifactId>influxdb-client</artifactId>
         <groupId>com.influxdb</groupId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -67,7 +67,7 @@
     <scm>
         <connection>scm:git:[email protected]:influxdata/influxdb-client-java.git</connection>
         <developerConnection>scm:git:[email protected]:influxdata/influxdb-client-java.git</developerConnection>
-        <url>http://github.com/influxdata/influxdb-client-java/tree/master</url>
+        <url>https://github.com/influxdata/influxdb-client-java/tree/master</url>
       <tag>HEAD</tag>
   </scm>
 
@@ -98,25 +98,6 @@
             <artifactId>influxdb-client-java</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.squareup.retrofit2</groupId>
-            <artifactId>adapter-rxjava2</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.squareup.okhttp3</groupId>
-                    <artifactId>okhttp</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.squareup.retrofit2</groupId>
-                    <artifactId>retrofit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.reactivex.rxjava2</groupId>
-                    <artifactId>rxjava</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>com.influxdb</groupId>
             <artifactId>influxdb-client-test</artifactId>