pFad - Phonifier reborn

From 188df9ed3dfcb9a1c94757c7fed397e16f410155 Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Mon, 29 Aug 2022 10:50:01 +0200 Subject: [PATCH 01/55] [maven-release-plugin] prepare for next development iteration --- client-core/pom.xml | 4 ++-- client-kotlin/pom.xml | 4 ++-- client-legacy/pom.xml | 4 ++-- client-osgi/pom.xml | 4 ++-- client-reactive/pom.xml | 4 ++-- client-scala/cross/2.12/pom.xml | 4 ++-- client-scala/cross/2.13/pom.xml | 4 ++-- client-test/pom.xml | 4 ++-- client-utils/pom.xml | 4 ++-- client/pom.xml | 4 ++-- examples/pom.xml | 4 ++-- flux-dsl/pom.xml | 4 ++-- karaf/karaf-assembly/pom.xml | 2 +- karaf/karaf-features/pom.xml | 2 +- karaf/karaf-kar/pom.xml | 4 ++-- karaf/pom.xml | 4 ++-- pom.xml | 16 ++++++++-------- spring/pom.xml | 6 +++--- 18 files changed, 41 insertions(+), 41 deletions(-) diff --git a/client-core/pom.xml b/client-core/pom.xml index f0ff3a865ab..4cc8cda6dd4 100644 --- a/client-core/pom.xml +++ b/client-core/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT influxdb-client-core @@ -66,7 +66,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git https://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD diff --git a/client-kotlin/pom.xml b/client-kotlin/pom.xml index c7f0789e5ef..91aa34030ad 100644 --- a/client-kotlin/pom.xml +++ b/client-kotlin/pom.xml @@ -26,7 +26,7 @@ influxdb-client com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT 4.0.0 @@ -72,7 +72,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git https://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD diff --git a/client-legacy/pom.xml b/client-legacy/pom.xml index b08548058a6..9141f8a8e1e 100644 --- a/client-legacy/pom.xml +++ b/client-legacy/pom.xml @@ -28,7 +28,7 @@ com.influxdb influxdb-client - 6.5.0 + 6.6.0-SNAPSHOT influxdb-client-flux @@ -66,7 +66,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git https://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml index b06ebeae7c9..12cbc12e4bf 100644 --- a/client-osgi/pom.xml +++ b/client-osgi/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT influxdb-client-osgi @@ -65,7 +65,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git https://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD diff --git a/client-reactive/pom.xml b/client-reactive/pom.xml index 3613b93c3dc..677b8fbad49 100644 --- a/client-reactive/pom.xml +++ b/client-reactive/pom.xml @@ -26,7 +26,7 @@ influxdb-client com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT 4.0.0 @@ -68,7 +68,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git https://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD diff --git a/client-scala/cross/2.12/pom.xml b/client-scala/cross/2.12/pom.xml index 3643c01a7d5..61b1646af6d 100644 --- a/client-scala/cross/2.12/pom.xml +++ b/client-scala/cross/2.12/pom.xml @@ -26,7 +26,7 @@ influxdb-client com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT ../../../pom.xml 4.0.0 @@ -68,7 +68,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git https://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD diff --git a/client-scala/cross/2.13/pom.xml b/client-scala/cross/2.13/pom.xml index a9009ead289..0a44995b6c1 100644 --- a/client-scala/cross/2.13/pom.xml +++ b/client-scala/cross/2.13/pom.xml @@ -26,7 +26,7 @@ influxdb-client com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT ../../../pom.xml 4.0.0 @@ -68,7 +68,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git https://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD diff --git a/client-test/pom.xml b/client-test/pom.xml index f839fa2d1cf..0a69d6e4712 100644 --- a/client-test/pom.xml +++ b/client-test/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT influxdb-client-test @@ -68,7 +68,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git https://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD diff --git a/client-utils/pom.xml b/client-utils/pom.xml index 8dded8db9bf..2b674723948 100644 --- a/client-utils/pom.xml +++ b/client-utils/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT influxdb-client-utils @@ -66,7 +66,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git https://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD diff --git a/client/pom.xml b/client/pom.xml index ab4cdfc93b8..3af6f06f42b 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ influxdb-client com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT 4.0.0 @@ -68,7 +68,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git https://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD diff --git a/examples/pom.xml b/examples/pom.xml index ad99856aa23..4cde9e902f7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -27,12 +27,12 @@ influxdb-client com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT true - 6.5.0 + 6.6.0-SNAPSHOT 4.0.0 diff --git a/flux-dsl/pom.xml b/flux-dsl/pom.xml index 0b2b9d5feef..e64009732eb 100644 --- a/flux-dsl/pom.xml +++ b/flux-dsl/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT flux-dsl @@ -66,7 +66,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git https://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD diff --git a/karaf/karaf-assembly/pom.xml b/karaf/karaf-assembly/pom.xml index 5747fb9c31d..c8325cc84fb 100644 --- a/karaf/karaf-assembly/pom.xml +++ b/karaf/karaf-assembly/pom.xml @@ -28,7 +28,7 @@ influxdb-karaf com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT influxdb-karaf-assembly diff --git a/karaf/karaf-features/pom.xml b/karaf/karaf-features/pom.xml index 6a3823c5353..530fe247796 100644 --- a/karaf/karaf-features/pom.xml +++ b/karaf/karaf-features/pom.xml @@ -28,7 +28,7 @@ influxdb-karaf com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT influxdb-karaf-features diff --git a/karaf/karaf-kar/pom.xml b/karaf/karaf-kar/pom.xml index 08a81d4ea4c..dc0c2144f87 100644 --- a/karaf/karaf-kar/pom.xml +++ b/karaf/karaf-kar/pom.xml @@ -28,7 +28,7 @@ influxdb-karaf com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT influxdb-karaf-kar @@ -75,7 +75,7 @@ ${project.groupId} influxdb-karaf-features - 6.5.0 + 6.6.0-SNAPSHOT features xml diff --git a/karaf/pom.xml b/karaf/pom.xml index 4ae29aae98d..b1c861dc232 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT influxdb-karaf @@ -67,7 +67,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git https://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD diff --git a/pom.xml b/pom.xml index 7ef686753fd..43079c9ad77 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ com.influxdb influxdb-client - 6.5.0 + 6.6.0-SNAPSHOT pom @@ -87,7 +87,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git http://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD @@ -481,38 +481,38 @@ com.influxdb influxdb-client-test - 6.5.0 + 6.6.0-SNAPSHOT test com.influxdb influxdb-client-core - 6.5.0 + 6.6.0-SNAPSHOT com.influxdb influxdb-client-utils - 6.5.0 + 6.6.0-SNAPSHOT com.influxdb influxdb-client-java - 6.5.0 + 6.6.0-SNAPSHOT com.influxdb influxdb-client-reactive - 6.5.0 + 6.6.0-SNAPSHOT com.influxdb influxdb-client-flux - 6.5.0 + 6.6.0-SNAPSHOT diff --git a/spring/pom.xml b/spring/pom.xml index a550d2e1fb8..83c0fe6eb62 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -26,12 +26,12 @@ influxdb-client com.influxdb - 6.5.0 + 6.6.0-SNAPSHOT 4.0.0 influxdb-spring - 6.5.0 + 6.6.0-SNAPSHOT jar Spring Integration for InfluxDB 2.x @@ -68,7 +68,7 @@ scm:git:git@github.com:influxdata/influxdb-client-java.git scm:git:git@github.com:influxdata/influxdb-client-java.git https://github.com/influxdata/influxdb-client-java/tree/master - v6.5.0 + HEAD From 930738306b7a912070ec4211649d74c10085b661 Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Mon, 29 Aug 2022 11:00:19 +0200 Subject: [PATCH 02/55] chore(release): prepare for next development iteration --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a918adce79b..00596f5bfd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 6.6.0 [unreleased] + ## 6.5.0 [2022-08-29] ### Breaking Changes From 8a4e7d23e456a2e663c68e0ad2e7b94b63bf67bb Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Mon, 29 Aug 2022 11:03:22 +0200 Subject: [PATCH 03/55] fix(docs): link to PR --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00596f5bfd3..1ca328153ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ The `percentile()` function renamed to `quantile()`. ### Features -1. [#366](https://github.com/influxdata/influxdb-client-java/pull/356): Added an endpoint to query with InfluxQL (v1) for more info see [README.md](./client). +1. [#366](https://github.com/influxdata/influxdb-client-java/pull/366): Added an endpoint to query with InfluxQL (v1) for more info see [README.md](./client). ### Bug Fixes 1. [#390](https://github.com/influxdata/influxdb-client-java/pull/390): Rename `percentile()` function renamed to `quantile()` [FluxDSL] From fbc340d7d1a7033289f1e8ff56bd4ff8d8275c67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 06:50:28 +0200 Subject: [PATCH 04/55] chore(deps-dev): bump logback-classic from 1.2.11 to 1.3.0 (#408) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps-dev): bump logback-classic from 1.2.11 to 1.3.0 Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.2.11 to 1.3.0. - [Release notes](https://github.com/qos-ch/logback/releases) - [Commits](https://github.com/qos-ch/logback/compare/v_1.2.11...v_1.3.0) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * docs: update CHANGELOG.md Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Bednář --- CHANGELOG.md | 6 ++++++ client-osgi/pom.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ca328153ad..4a5132de359 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ## 6.6.0 [unreleased] +### Dependencies +Update dependencies: + +#### Test: + - [#408](https://github.com/influxdata/influxdb-client-java/pull/408): `logback-classic` to `1.3.0` + ## 6.5.0 [2022-08-29] ### Breaking Changes diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml index 12cbc12e4bf..3abb0dce32a 100644 --- a/client-osgi/pom.xml +++ b/client-osgi/pom.xml @@ -191,7 +191,7 @@ ch.qos.logback logback-classic - 1.2.11 + 1.3.0 test From 631133eb09270bcba500c3fd8f6c664b5d16b5d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Bedn=C3=A1=C5=99?= Date: Thu, 1 Sep 2022 06:45:51 +0200 Subject: [PATCH 05/55] fix(docs): doclint for JDK 18 (#406) --- .circleci/config.yml | 2 +- CHANGELOG.md | 3 + .../client/osgi/InfluxDBConnector.java | 6 +- .../client/osgi/LineProtocolWriter.java | 10 +- .../com/influxdb/client/osgi/PointWriter.java | 16 +-- .../com/influxdb/client/InfluxQLQueryApi.java | 4 +- .../com/influxdb/query/dsl/Expressions.java | 4 +- .../java/com/influxdb/query/dsl/Flux.java | 102 ++++++++++++------ .../query/dsl/VariableAssignment.java | 4 +- .../functions/AbstractFunctionCallFlux.java | 3 +- .../dsl/functions/AbstractFunctionFlux.java | 6 +- .../query/dsl/functions/AggregateWindow.java | 6 +- .../query/dsl/functions/ColumnsFlux.java | 6 +- .../query/dsl/functions/CountFlux.java | 6 +- .../query/dsl/functions/CovarianceFlux.java | 6 +- .../dsl/functions/CumulativeSumFlux.java | 6 +- .../query/dsl/functions/DerivativeFlux.java | 6 +- .../query/dsl/functions/DifferenceFlux.java | 6 +- .../query/dsl/functions/DistinctFlux.java | 6 +- .../query/dsl/functions/DropFlux.java | 6 +- .../query/dsl/functions/DuplicateFlux.java | 6 +- .../query/dsl/functions/ExpressionFlux.java | 3 +- .../query/dsl/functions/FillFlux.java | 3 +- .../query/dsl/functions/FilterFlux.java | 6 +- .../query/dsl/functions/FirstFlux.java | 3 +- .../query/dsl/functions/FromFlux.java | 6 +- .../query/dsl/functions/GroupFlux.java | 6 +- .../query/dsl/functions/IntegralFlux.java | 6 +- .../dsl/functions/InterpolateLinearFlux.java | 3 +- .../query/dsl/functions/JoinFlux.java | 6 +- .../query/dsl/functions/KeepFlux.java | 6 +- .../query/dsl/functions/LastFlux.java | 6 +- .../query/dsl/functions/LimitFlux.java | 6 +- .../influxdb/query/dsl/functions/MapFlux.java | 6 +- .../influxdb/query/dsl/functions/MaxFlux.java | 6 +- .../query/dsl/functions/MeanFlux.java | 6 +- .../influxdb/query/dsl/functions/MinFlux.java | 6 +- .../query/dsl/functions/PivotFlux.java | 6 +- .../query/dsl/functions/QuantileFlux.java | 6 +- .../query/dsl/functions/RangeFlux.java | 6 +- .../query/dsl/functions/ReduceFlux.java | 6 +- .../query/dsl/functions/RenameFlux.java | 6 +- .../query/dsl/functions/SampleFlux.java | 6 +- .../influxdb/query/dsl/functions/SetFlux.java | 6 +- .../query/dsl/functions/SkewFlux.java | 6 +- .../query/dsl/functions/SortFlux.java | 6 +- .../query/dsl/functions/SpreadFlux.java | 6 +- .../query/dsl/functions/StddevFlux.java | 6 +- .../influxdb/query/dsl/functions/SumFlux.java | 6 +- .../query/dsl/functions/TailFlux.java | 6 +- .../query/dsl/functions/TimeShiftFlux.java | 6 +- .../query/dsl/functions/ToBoolFlux.java | 3 +- .../query/dsl/functions/ToDurationFlux.java | 3 +- .../query/dsl/functions/ToFloatFlux.java | 3 +- .../influxdb/query/dsl/functions/ToFlux.java | 6 +- .../query/dsl/functions/ToIntFlux.java | 3 +- .../query/dsl/functions/ToStringFlux.java | 3 +- .../query/dsl/functions/ToTimeFlux.java | 3 +- .../query/dsl/functions/ToUIntFlux.java | 3 +- .../dsl/functions/TruncateTimeColumnFlux.java | 6 +- .../query/dsl/functions/WindowFlux.java | 6 +- .../query/dsl/functions/YieldFlux.java | 6 +- 62 files changed, 283 insertions(+), 150 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fde07cdbbc4..541b51ac593 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,7 +49,7 @@ commands: - run: name: "Running tests" command: | - mvn -B -U clean install -Dmaven.javadoc.skip=true -Dmaven.dokka.skip=true -Dbuild.env=CI << parameters.junit-tests >> + mvn -B -U clean install -Dbuild.env=CI << parameters.junit-tests >> - save_cache: name: Saving Maven Cache key: *cache-key diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a5132de359..c702cebd177 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## 6.6.0 [unreleased] +### Documentation +1. [#406](https://github.com/influxdata/influxdb-client-java/pull/406): Fix compatibility of the `doclint` between JDK 8 and JDK 18 + ### Dependencies Update dependencies: diff --git a/client-osgi/src/main/java/com/influxdb/client/osgi/InfluxDBConnector.java b/client-osgi/src/main/java/com/influxdb/client/osgi/InfluxDBConnector.java index 3cd8d75d228..0578e4392c2 100644 --- a/client-osgi/src/main/java/com/influxdb/client/osgi/InfluxDBConnector.java +++ b/client-osgi/src/main/java/com/influxdb/client/osgi/InfluxDBConnector.java @@ -50,8 +50,8 @@ *
InfluxDB V2 client is created (by username and password) otherwise.
* * - *
The following connector properties are added to InfluxDB client too: organization, bucket, - * database, url and alias.
+ *
The following connector properties are added to InfluxDB client too: organization, + * bucket, database, url and alias.
*/ @Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, service = InfluxDBConnector.class) @Designate(ocd = InfluxDBConnector.Config.class) @@ -77,7 +77,7 @@ public class InfluxDBConnector { String alias(); /** - * InfluxDB URL, i.e. http://localhost:8086 + * InfluxDB URL, i.e. http://localhost:8086 */ @AttributeDefinition(name = "InfluxDB URL") String url(); diff --git a/client-osgi/src/main/java/com/influxdb/client/osgi/LineProtocolWriter.java b/client-osgi/src/main/java/com/influxdb/client/osgi/LineProtocolWriter.java index c95890fa58c..7466519866c 100644 --- a/client-osgi/src/main/java/com/influxdb/client/osgi/LineProtocolWriter.java +++ b/client-osgi/src/main/java/com/influxdb/client/osgi/LineProtocolWriter.java @@ -53,8 +53,8 @@ *
record ({@link String}): value must be a single line protocol record
records ({@link List}): value must be a list of line protocol records
precision ({@link String}, optional): write precision, values: s, ms, us, - * ns, default: ns
precision ({@link String}, optional): write precision, values: s, ms, + * us, ns, default: ns
organization ({@link String}, optional): used to override InfluxDB organization of * {@link LineProtocolWriter} service (by event).
bucket ({@link String}, optional): used to override InfluxDB bucket of @@ -114,9 +114,9 @@ public class LineProtocolWriter implements EventHandler { String[] event_topics() default {DEFAULT_EVENT_TOPIC}; /** - * OSGi target filter for InfluxDB connection, i.e. (alias=test). The following properties are - * copied from {@link InfluxDBConnector}: organization, bucket, database, - * url, alias. + * OSGi target filter for InfluxDB connection, i.e. (alias=test). The following properties are + * copied from {@link InfluxDBConnector}: organization, bucket, database, + * url, alias. */ @AttributeDefinition(required = false, name = "InfluxDB client target", description = "OSGi target filter of InfluxDB client service") diff --git a/client-osgi/src/main/java/com/influxdb/client/osgi/PointWriter.java b/client-osgi/src/main/java/com/influxdb/client/osgi/PointWriter.java index 91f83c61c94..3742ca43f83 100644 --- a/client-osgi/src/main/java/com/influxdb/client/osgi/PointWriter.java +++ b/client-osgi/src/main/java/com/influxdb/client/osgi/PointWriter.java @@ -72,9 +72,10 @@ * *
One of point or points must be set.
* - *
Measurement name is defined by OSGi event topic if {@link Map} type is used: measure name is fragment after the - * last slash (/) character. For example: weather measure is written if event topic is - * influxdb/point/weather (in this case OSGi event filter must be changed, i.e. influxdb/point/*).
+ *
Measurement name is defined by OSGi event topic if {@link Map} type is used: measure name is fragment after + * the last slash (/) character. For example: weather measure is written + * if event topic is influxdb/point/weather (in this case OSGi event filter must be changed, + * i.e. influxdb/point/*).
* *
Structured data can be decorated with host name, host address or timestamp (by configuration).
*/ @@ -148,9 +149,9 @@ public class PointWriter implements EventHandler { String[] event_topics() default {DEFAULT_EVENT_TOPIC}; /** - * OSGi target filter for InfluxDB connection, i.e. (alias=test). The following properties are - * copied from {@link InfluxDBConnector}: organization, bucket, database, - * url, alias. + * OSGi target filter for InfluxDB connection, i.e. (alias=test). The following properties are + * copied from {@link InfluxDBConnector}: organization, bucket, database, + * url, alias. */ @AttributeDefinition(required = false, name = "InfluxDB client target", description = "OSGi target filter of InfluxDB client service") @@ -179,7 +180,8 @@ public class PointWriter implements EventHandler { boolean timestamp_add() default false; /** - * Precision used if adding timestamp, values: s, ms, us, ns. + * Precision used if adding timestamp, values: s, ms, us, + * ns. */ @AttributeDefinition(required = false, name = "Precision", description = "Precision used if adding timestamp") diff --git a/client/src/main/java/com/influxdb/client/InfluxQLQueryApi.java b/client/src/main/java/com/influxdb/client/InfluxQLQueryApi.java index 8bc3832e162..c3624065d56 100644 --- a/client/src/main/java/com/influxdb/client/InfluxQLQueryApi.java +++ b/client/src/main/java/com/influxdb/client/InfluxQLQueryApi.java @@ -64,8 +64,8 @@ public interface InfluxQLQueryApi { * Executes an InfluxQL query against the legacy endpoint. * The value extractor is called for each resulting column to convert the string value returned by query into a * custom type. - * - *
Example

+ *
+ * Example: *
      * InfluxQLQueryResult result = influxQLQueryApi.query(
      *             new InfluxQLQuery("SELECT FIRST(\"free\") FROM \"influxql\"", DATABASE_NAME)
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/Expressions.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/Expressions.java
index eb559e1089b..2d4ebcd175e 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/Expressions.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/Expressions.java
@@ -37,8 +37,8 @@
 
 /**
  * A container holding a list of {@link Expression}s.
- *
- * Example
+ * 
+ * Example
  * 
  * VariableAssignment a = Flux.from("test1").asVariable("a");
  * VariableAssignment b = Flux.from("test2").asVariable("b");
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/Flux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/Flux.java
index 225a10e0ddb..18339c9365e 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/Flux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/Flux.java
@@ -98,7 +98,8 @@
  * 

  * Flux Specification
  *
- * The functions:
+ * 
+ * The functions:
  * 

  * {@link AggregateWindow}
  * {@link FromFlux}
@@ -205,7 +206,8 @@ public static FromFlux from(@Nonnull final String bucket, @Nonnull final String[
     /**
      * Applies an aggregate or selector function to fixed windows of time.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link AggregateWindow#withEvery(Long, ChronoUnit)}
      * {@link AggregateWindow#withEvery(String)}
@@ -226,7 +228,8 @@ public final AggregateWindow aggregateWindow() {
     /**
      * Applies an aggregate or selector function to fixed windows of time.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link AggregateWindow#withEvery(Long, ChronoUnit)}
      * {@link AggregateWindow#withEvery(String)}
@@ -279,7 +282,8 @@ public static ArrayFromFlux arrayFrom(@Nonnull final Map... rows
     /**
      * Join two time series together on time and the list of tags.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link JoinFlux#withTable(String, Flux)}
      * {@link JoinFlux#withOn(String)}
@@ -327,7 +331,8 @@ public static JoinFlux join(@Nonnull final String name1,
     /**
      * It will return a table containing only columns that are specified.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link KeepFlux#withColumns(String[])}
      * {@link KeepFlux#withFunction(String)}
@@ -423,7 +428,8 @@ public final CountFlux count(@Nonnull final String column) {
     /**
      * Covariance computes the covariance between two columns.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link CovarianceFlux#withColumns(String[])}
      * {@link CovarianceFlux#withColumns(Collection)}
@@ -546,7 +552,8 @@ public final CovarianceFlux covariance(@Nonnull final String[] columns,
     /**
      * Computes a running sum for non null records in the table.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link CumulativeSumFlux#withColumns(String[])}
      * {@link CumulativeSumFlux#withColumns(Collection)}
@@ -587,7 +594,8 @@ public final CumulativeSumFlux cumulativeSum(@Nonnull final Collection c
     /**
      * Computes the time based difference between subsequent non null records.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link DerivativeFlux#withUnit(Long, ChronoUnit)}
      * {@link DerivativeFlux#withNonNegative(boolean)}
@@ -620,7 +628,8 @@ public final DerivativeFlux derivative(@Nonnull final Long duration, @Nonnull fi
     /**
      * Difference computes the difference between subsequent non null records.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link DifferenceFlux#withNonNegative(boolean)}
      * {@link DifferenceFlux#withColumns(String[])}
@@ -697,7 +706,8 @@ public final DifferenceFlux difference(@Nonnull final String[] columns, final bo
     /**
      * Distinct produces the unique values for a given column.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link DistinctFlux#withColumn(String)}
      * {@link DistinctFlux#withPropertyNamed(String)}
@@ -726,7 +736,8 @@ public final DistinctFlux distinct(@Nonnull final String column) {
     /**
      * Drop will exclude specified columns from a table.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link DropFlux#withColumns(String[])}
      * {@link DropFlux#withFunction(String)}
@@ -779,7 +790,8 @@ public final DropFlux drop(@Nonnull final String function) {
     /**
      * Duplicate will duplicate a specified column in a table.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link DuplicateFlux#withAs(String)}
      * {@link DuplicateFlux#withColumn(String)} (String)}
@@ -798,7 +810,8 @@ public final DuplicateFlux duplicate() {
     /**
      * Duplicate will duplicate a specified column in a table.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link DuplicateFlux#withAs(String)}
      * {@link DuplicateFlux#withColumn(String)} (String)}
@@ -819,7 +832,8 @@ public final DuplicateFlux duplicate(@Nonnull final String column, @Nonnull fina
     /**
      * Replaces all null values in input tables with a non-null value.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link FillFlux#withUsePrevious(Boolean)}
      * {@link FillFlux#withColumn(String)}
@@ -847,7 +861,8 @@ public final FillFlux fill(@Nonnull final Object value) {
     /**
      * Returns the first result of the query.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link FilterFlux#withRestrictions(Restrictions)}
      * {@link FilterFlux#withPropertyNamed(String)}
@@ -889,7 +904,8 @@ public final FirstFlux first() {
     /**
      * Groups results by a user-specified set of tags.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link GroupFlux#withBy(String[])}
      * {@link GroupFlux#withBy(Collection)}
@@ -989,7 +1005,8 @@ public final GroupFlux groupExcept(@Nonnull final String[] except) {
     /**
      * For each aggregate column, it outputs the area under the curve of non null records.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link IntegralFlux#withUnit(Long, ChronoUnit)}
      * {@link IntegralFlux#withPropertyNamed(String)}
@@ -1024,7 +1041,8 @@ public final IntegralFlux integral(@Nonnull final Long duration, @Nonnull final
      * The `interpolate.linear` function inserts rows at regular intervals using linear interpolation to determine
      * values for inserted rows.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link InterpolateLinearFlux#withEvery(long, ChronoUnit)}
      * {@link InterpolateLinearFlux#withPropertyNamed(String)}
@@ -1079,7 +1097,8 @@ public final LastFlux last(@Nonnull final String column) {
     /**
      * Restricts the number of rows returned in the results.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link LimitFlux#withN(int)}
      * {@link LimitFlux#withPropertyNamed(String)}
@@ -1123,7 +1142,8 @@ public final LimitFlux limit(final int numberOfResults, final int offset) {
     /**
      * Applies a function to each row of the table.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link MapFlux#withFunction(String)}
      * {@link MapFlux#withPropertyNamed(String)}
@@ -1216,7 +1236,8 @@ public final MinFlux min(@Nonnull final String column) {
     /**
      * Quantile is both an aggregate operation and a selector operation depending on selected options.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link QuantileFlux#withColumn(String)}
      * {@link QuantileFlux#withQuantile(Float)}
@@ -1311,7 +1332,8 @@ public final QuantileFlux quantile(@Nonnull final String column,
      * Pivot collects values stored vertically (column-wise) in a table
      * and aligns them horizontally (row-wise) into logical sets.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link PivotFlux#withRowKey(String[])}
      * {@link PivotFlux#withRowKey(Collection)}
@@ -1367,7 +1389,8 @@ public final PivotFlux pivot(@Nonnull final Collection rowKey,
     /**
      * Filters the results by time boundaries.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link RangeFlux#withStart(Instant)}
      * {@link RangeFlux#withStart(Long, ChronoUnit)}
@@ -1472,7 +1495,8 @@ public final RangeFlux range(final Long start) {
     /**
      * Reduce aggregates records in each table according to the reducer.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link ReduceFlux#withFunction(String)} 
      * {@link ReduceFlux#withIdentity(String)}
@@ -1498,7 +1522,8 @@ public final ReduceFlux reduce(@Nonnull final String function, @Nonnull final St
     /**
      * Rename will rename specified columns in a table.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link RenameFlux#withColumns(Map)} 
      * {@link RenameFlux#withFunction(String)}
@@ -1540,7 +1565,8 @@ public final RenameFlux rename(@Nonnull final String function) {
     /**
      * Sample values from a table.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link SampleFlux#withN(int)}
      * {@link SampleFlux#withPos(int)}
@@ -1592,7 +1618,8 @@ public final SampleFlux sample(final int n, final int pos) {
     /**
      * Assigns a static value to each record.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link SetFlux#withKeyValue(String, String)}
      * {@link SetFlux#withPropertyNamed(String)}
@@ -1622,7 +1649,8 @@ public final SetFlux set(@Nonnull final String key, @Nonnull final String value)
     /**
      * Shift add a fixed duration to time columns.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link TimeShiftFlux#withDuration(Long, ChronoUnit)}
      * {@link TimeShiftFlux#withColumns(String[])}
@@ -1851,7 +1879,8 @@ public final SumFlux sum(@Nonnull final String column) {
     /**
      * Caps the number of records in output tables.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link TailFlux#withN(int)}
      * {@link TailFlux#withPropertyNamed(String)}
@@ -1895,7 +1924,8 @@ public final TailFlux tail(final int numberOfResults, final int offset) {
     /**
      * To operation takes data from a stream and writes it to a bucket.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link ToFlux#withBucket(String)}
      * {@link ToFlux#withBucketID(String)}
@@ -2169,7 +2199,8 @@ public static UnionFlux union(@Nonnull final Flux... tables) {
     /**
      * Groups the results by a given time range.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link WindowFlux#withEvery(Long, ChronoUnit)}
      * {@link WindowFlux#withPeriod(Long, ChronoUnit)}
@@ -2351,7 +2382,8 @@ public final WindowFlux window(@Nonnull final Long every,
     /**
      * Yield a query results to yielded results.
      *
-     * The parameters had to be defined by:
+     * 
+     * The parameters had to be defined by:
      * 

      * {@link YieldFlux#withName(String)}
      * {@link YieldFlux#withPropertyNamed(String)}
@@ -2421,7 +2453,8 @@ public final  F function(@Nonnull final Clas
     /**
      * Creates a piped function call.
      *
-     * Example Definition
+     * 
+     * Example Definition
      * 
      * public static class MultByXFunction extends AbstractFunctionFlux<MultByXFunction.MultByXFunctionCall> {
      *
@@ -2447,7 +2480,8 @@ public final  F function(@Nonnull final Clas
      *     }
      * }
      * 
-     * Example Usage
+     * 
+     * Example Usage
      * 
      * MultByXFunction multByX = new MultByXFunction();
      *
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/VariableAssignment.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/VariableAssignment.java
index d6c58b824f7..a69645aa121 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/VariableAssignment.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/VariableAssignment.java
@@ -30,8 +30,8 @@
 
 /**
  * Hold the variable name and expression of an assignment.
- *
- * Example
+ * 
+ * Example
  * 
  * VariableAssignment a = Flux.from("test1").asVariable("a");
  * VariableAssignment b = Flux.from("test2").asVariable("b");
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionCallFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionCallFlux.java
index 54196d15e94..281ab745920 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionCallFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionCallFlux.java
@@ -30,7 +30,8 @@
 /**
  * Base class defining a function invocation.
  *
- * Example
+ * 
+ * Example
  * 
  *  public static class MyCustomFunctionCall extends AbstractFunctionCallFlux {
  *     public MyCustomFunctionCall(@Nonnull String name) {
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionFlux.java
index 103228c3c9a..a42b966b0a2 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AbstractFunctionFlux.java
@@ -45,7 +45,8 @@
  * The function definition describes the implementation of a function.
  * A concrete call to this function can be created via the {@link #invoke()} method.
  *
- * Example Definition
+ * 
+ * Example Definition
  * 
  * public static class MyCustomFunction extends AbstractFunctionFlux<MyCustomFunction.MyCustomFunctionCall> {
  *
@@ -71,7 +72,8 @@
  *     }
  * }
  * 
- * Example Usage
+ * 
+ * Example Usage
  * 
  * MyCustomFunction fun = new MyCustomFunction();
  *
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AggregateWindow.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AggregateWindow.java
index 5df700d43a8..f44514bea2f 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AggregateWindow.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/AggregateWindow.java
@@ -31,7 +31,8 @@
  * Applies an aggregate or selector function (any function with a column parameter) to fixed windows of time.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  *     every - The duration of windows. [duration]
  *     fn - The aggregate function used in the operation. [function]
@@ -46,7 +47,8 @@
  *     Defaults to true. [boolean]
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ColumnsFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ColumnsFlux.java
index 377125470d3..a86b3aaf31c 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ColumnsFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ColumnsFlux.java
@@ -30,7 +30,8 @@
  * The columns() function lists the column labels of input tables.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * 
  *     column -
@@ -38,7 +39,8 @@
  * 
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CountFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CountFlux.java
index 075b1e83020..043f72255be 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CountFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CountFlux.java
@@ -29,12 +29,14 @@
 /**
  * Counts the number of results. See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * column - The column to aggregate [string]. Default to _value.
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *      .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CovarianceFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CovarianceFlux.java
index bf555ea515b..8ec553d9d0d 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CovarianceFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CovarianceFlux.java
@@ -31,7 +31,8 @@
  * Covariance is an aggregate operation. Covariance computes the covariance between two columns.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * 
  * columns - List of columns on which to compute the covariance.
@@ -44,7 +45,8 @@
  * 
valueDst - The column into which the result will be placed. Defaults to _value` [string].
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CumulativeSumFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CumulativeSumFlux.java
index e29470c923d..4d9b4825187 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CumulativeSumFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/CumulativeSumFlux.java
@@ -32,12 +32,14 @@
  * The output table schema will be the same as the input table.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * columns - a list of columns on which to operate [array of strings]
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DerivativeFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DerivativeFlux.java
index f49d0e09d74..bfbe09890bd 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DerivativeFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DerivativeFlux.java
@@ -32,7 +32,8 @@
  * Computes the time based difference between subsequent non null records.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * unit - The time duration to use for the result [duration]
  * nonNegative - Indicates if the derivative is allowed to be negative [boolean].
@@ -40,7 +41,8 @@
  * timeColumn - The source column for the time values. Defaults to `_time` [string].
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DifferenceFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DifferenceFlux.java
index fff04485690..39dc986da5a 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DifferenceFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DifferenceFlux.java
@@ -31,7 +31,8 @@
  * Difference computes the difference between subsequent non null records.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * 
  * nonNegative - Indicates if the derivative is allowed to be negative.
@@ -44,7 +45,8 @@
  * 
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DistinctFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DistinctFlux.java
index 3d206830f29..4f1cc763848 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DistinctFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DistinctFlux.java
@@ -30,14 +30,16 @@
  * Distinct produces the unique values for a given column.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * 
  * column - The column on which to track unique values [string]
  * 
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DropFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DropFlux.java
index b677efe74bd..e9dbf154388 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DropFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DropFlux.java
@@ -31,7 +31,8 @@
  * Drop will exclude specified columns from a table.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * 
  * columns - The list of columns which should be excluded from the resulting table.
@@ -43,7 +44,8 @@
  * 
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DuplicateFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DuplicateFlux.java
index b2c61c50366..86d89133496 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DuplicateFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/DuplicateFlux.java
@@ -30,7 +30,8 @@
  * Duplicate will duplicate a specified column in a table.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * 
  * column - The column to duplicate. [string]
@@ -40,7 +41,8 @@
  * 
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ExpressionFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ExpressionFlux.java
index a0d262b3eaa..67e1f4a9c9d 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ExpressionFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ExpressionFlux.java
@@ -30,7 +30,8 @@
 /**
  * The custom Flux expression.
  *
- * Example
+ * 
+ * Example
  * 
  *     Flux.from("telegraf")
  *          .expression("map(fn: (r) => r._value * r._value)")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FillFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FillFlux.java
index 11b0e4f7a78..64a8b754981 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FillFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FillFlux.java
@@ -30,7 +30,8 @@
  * Replaces all null values in input tables with a non-null value.
  * See SPEC.
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FilterFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FilterFlux.java
index d783b9ba274..cce3f86688b 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FilterFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FilterFlux.java
@@ -31,7 +31,8 @@
  * Filters the results using an expression.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * 
  * fn - Function to when filtering the records. The function must accept a single parameter
@@ -40,7 +41,8 @@
  * 
  * 
  *
- * Example
+ * 
+ * Example
  * 
  *  Restrictions restriction = Restrictions.and(
  *          Restrictions.measurement().equal("mem"),
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FirstFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FirstFlux.java
index 95cbe224483..9dd0b2542da 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FirstFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FirstFlux.java
@@ -29,7 +29,8 @@
  * Returns the first result of the query.
  * See SPEC.
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FromFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FromFlux.java
index ec5b2ac7a09..98ad7c30758 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FromFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/FromFlux.java
@@ -32,13 +32,15 @@
  * From produces a stream of tables from the specified bucket.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * bucket - The name of the bucket to query [string]
  * hosts - array of strings from(bucket:"telegraf", hosts:["host1", "host2"])
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux.from("telegraf");
  *
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/GroupFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/GroupFlux.java
index de8008d8cd7..99ed11860f4 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/GroupFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/GroupFlux.java
@@ -31,13 +31,15 @@
  * Groups results by a user-specified set of tags.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * columns - List of columns used to calculate the new group key. Default [] [array of strings]
  * mode -  The grouping mode, can be one of by or except. The default is by [string].
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux.from("telegraf")
  *     .range(-30L, ChronoUnit.MINUTES)
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/IntegralFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/IntegralFlux.java
index 5e928ae8ec8..1dc4ae023c3 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/IntegralFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/IntegralFlux.java
@@ -32,12 +32,14 @@
  * The curve is defined as function where the domain is the record times and the range is the record values.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * unit - Time duration to use when computing the integral [duration]
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/InterpolateLinearFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/InterpolateLinearFlux.java
index 99dbee38480..add6512e173 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/InterpolateLinearFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/InterpolateLinearFlux.java
@@ -30,7 +30,8 @@
 /**
  * Inserts rows at regular intervals using linear interpolation to determine values for inserted rows.
  *
- * Example
+ * 
+ * Example
  * 
  *         Flux flux = Flux
  *                 .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/JoinFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/JoinFlux.java
index f5e5f04eb2e..4ba8a9bbf41 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/JoinFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/JoinFlux.java
@@ -36,7 +36,8 @@
  * Join two time series together on time and the list of on keys.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * tables - Map of tables to join. Currently only two tables are allowed. [map of tables]
  * on - List of tag keys that when equal produces a result set. [array of strings]
@@ -44,7 +45,8 @@
  * method - An optional parameter that specifies the type of join to be performed. 
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux cpu = Flux.from("telegraf")
  *     .filter(Restrictions.and(Restrictions.measurement().equal("cpu"), Restrictions.field().equal("usage_user")))
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/KeepFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/KeepFlux.java
index 25b2dcd8433..4ce31e8d57a 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/KeepFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/KeepFlux.java
@@ -32,7 +32,8 @@
  * Only columns in the group key that are also specified in keep will be kept in the resulting group key.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * 
  * columns - The list of columns that should be included in the resulting table.
@@ -44,7 +45,8 @@
  * 
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LastFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LastFlux.java
index 4a17a8891b5..aebbbcdac96 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LastFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LastFlux.java
@@ -30,12 +30,14 @@
  * Returns the last result of the query.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * column - The column used to verify the existence of a value [string]. Default to _value.
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LimitFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LimitFlux.java
index 9964ad98d18..6996a1e55de 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LimitFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/LimitFlux.java
@@ -30,13 +30,15 @@
  * Restricts the number of rows returned in the results.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * n - The maximum number of records to output [int].
  * offset - The number of records to skip per table [int]. Default to 0.
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MapFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MapFlux.java
index 1209d36d1dd..da1cf12e536 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MapFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MapFlux.java
@@ -30,7 +30,8 @@
  * Applies a function to each row of the table.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * 
  * fn - The function to apply to each row.
@@ -38,7 +39,8 @@
  * 
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Restrictions restriction = Restrictions.and(
  *     Restrictions.measurement().equal("cpu"),
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MaxFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MaxFlux.java
index e578f050747..d95c58f0997 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MaxFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MaxFlux.java
@@ -30,12 +30,14 @@
  * Returns the max value within the results.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * column - The column to use to calculate the maximum value [string]. Default is _value.
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MeanFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MeanFlux.java
index 8fdb6f99d96..c95dc0fc5c5 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MeanFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MeanFlux.java
@@ -30,12 +30,14 @@
  * Returns the mean of the within the results.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * column - The column to use to compute the mean [string]. Default to _value.
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MinFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MinFlux.java
index 97ac32f430e..a1d6edec507 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MinFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/MinFlux.java
@@ -30,12 +30,14 @@
  * Returns the min value within the results.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * column - The column to use to calculate the minimum value [string]. Default to _value.
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/PivotFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/PivotFlux.java
index f041f4df992..3b552b34357 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/PivotFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/PivotFlux.java
@@ -32,7 +32,8 @@
  * into logical sets.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * rowKey - List of columns used to uniquely identify a row for the output. [array of strings]
  * columnKey -
@@ -41,7 +42,8 @@
  * 
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux.from("telegraf")
  *     .pivot()
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/QuantileFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/QuantileFlux.java
index b5fb4ddfbb7..884562d8f1b 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/QuantileFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/QuantileFlux.java
@@ -32,7 +32,8 @@
  * as a float.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  *     column - column to aggregate. Defaults to _value. [string]
  *     quantile - value between 0 and 1 indicating the desired quantile. [float]
@@ -43,7 +44,8 @@
  *     [float]
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RangeFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RangeFlux.java
index a894fdc1aec..7cd2b0fc465 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RangeFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RangeFlux.java
@@ -32,7 +32,8 @@
  * Filters the results by time boundaries.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * start - Specifies the oldest time to be included in the results [duration or timestamp]
  * 
@@ -41,7 +42,8 @@
  * 
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ReduceFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ReduceFlux.java
index e5d24dd0438..a02ec8a3f21 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ReduceFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ReduceFlux.java
@@ -30,7 +30,8 @@
  * Reduce aggregates records in each table according to the reducer.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * 
  * fn -
@@ -39,7 +40,8 @@
  * 
identity - an initial value to use when creating a reducer ['a]
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Restrictions restriction = Restrictions.and(
  *     Restrictions.measurement().equal("cpu"),
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RenameFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RenameFlux.java
index c6598c360c8..5cbc5cbdcf5 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RenameFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RenameFlux.java
@@ -32,7 +32,8 @@
  * the column name in the group key will be updated.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * 
  * columns - The map of columns to rename and their corresponding new names. Cannot be used with fn.
@@ -44,7 +45,8 @@
  * 
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Map<String, String> map = new HashMap<>();
  * map.put("host", "server");
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SampleFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SampleFlux.java
index c64b1cdb814..4089ebecc31 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SampleFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SampleFlux.java
@@ -29,7 +29,8 @@
  * Sample values from a table.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * n - Sample every Nth element [int]
  * 
@@ -38,7 +39,8 @@
  * 
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux.from("telegraf")
  *     .filter(and(measurement().equal("cpu"), field().equal("usage_system")))
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SetFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SetFlux.java
index 0f588bcddad..d0f5cebd203 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SetFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SetFlux.java
@@ -30,13 +30,15 @@
  * Assigns a static value to each record.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * key - Label for the column to set [string].
  * value - Value for the column to set [string]
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SkewFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SkewFlux.java
index b81246c8de2..26999bffd13 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SkewFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SkewFlux.java
@@ -30,12 +30,14 @@
  * Skew of the results.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * column - The column on which to operate [string]. Default to _value.
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SortFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SortFlux.java
index 8ad89795429..2e1c80447a1 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SortFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SortFlux.java
@@ -31,7 +31,8 @@
  * Sorts the results by the specified columns Default sort is ascending.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * 
  * columns - List of columns used to sort; precedence from left to right.
@@ -40,7 +41,8 @@
  * 
desc - Sort results descending. Default false [bool]
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SpreadFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SpreadFlux.java
index 0393f6d61e3..e27503ec0f2 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SpreadFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SpreadFlux.java
@@ -30,12 +30,14 @@
  * Difference between min and max values.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * column - The column on which to operate [string]. Default to _value.
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/StddevFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/StddevFlux.java
index 4d9eadb8ac6..ec60b145c94 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/StddevFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/StddevFlux.java
@@ -30,12 +30,14 @@
  * Standard Deviation of the results.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * column - The column on which to operate [string]. Default to _value.
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SumFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SumFlux.java
index 9857bd31da0..5d6df9d64c6 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SumFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/SumFlux.java
@@ -30,12 +30,14 @@
  * Sum of the results.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * column - The column on which to operate [string]. Default to _value.
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TailFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TailFlux.java
index e5d5d4e0a11..7154934f3c4 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TailFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TailFlux.java
@@ -30,13 +30,15 @@
  * Tail caps the number of records in output tables to a fixed size n.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * n - The maximum number of records to output [int].
  * offset - The number of records to skip per table [int]. Default to 0.
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TimeShiftFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TimeShiftFlux.java
index 1538b52eac9..397d9050fbd 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TimeShiftFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TimeShiftFlux.java
@@ -32,14 +32,16 @@
  * Shift add a fixed duration to time columns.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * duration - The amount to add to each time value [duration]
  * columns - The list of all columns that should be shifted.
  * Defaults `["_start", "_stop", "_time"]` [array of strings].
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToBoolFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToBoolFlux.java
index 50d1645bc19..dd77de514e5 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToBoolFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToBoolFlux.java
@@ -29,7 +29,8 @@
  * Convert a value to a bool.
  * See SPEC.
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToDurationFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToDurationFlux.java
index 28f7239fd73..d956ea84616 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToDurationFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToDurationFlux.java
@@ -29,7 +29,8 @@
  * Convert a value to a duration.
  * See SPEC.
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFloatFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFloatFlux.java
index 61cd8935c09..9c3a463487b 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFloatFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFloatFlux.java
@@ -29,7 +29,8 @@
  * Convert a value to a float.
  * See SPEC.
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFlux.java
index 24a0d696662..7e0d015d833 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToFlux.java
@@ -31,7 +31,8 @@
  * The To operation takes data from a stream and writes it to a bucket.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  *     bucket - The bucket to which data will be written. [string]
  *     bucketID - The bucket to which data will be written. [string]
@@ -44,7 +45,8 @@
  *     fieldFn - Function that takes a record from the input table and returns an object.
  * 
  *
- * Examples
+ * 
+ * Examples
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToIntFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToIntFlux.java
index 08293d0f9a5..e81cc05e8ae 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToIntFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToIntFlux.java
@@ -29,7 +29,8 @@
  * Convert a value to a int.
  * See SPEC.
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToStringFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToStringFlux.java
index a6660c748ed..f74508eb39c 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToStringFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToStringFlux.java
@@ -29,7 +29,8 @@
  * Convert a value to a string.
  * See SPEC.
  *
- * Example
+ * 
+ * Example
  * 
  *  Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToTimeFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToTimeFlux.java
index 3deb96821c0..a1f10b34c16 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToTimeFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToTimeFlux.java
@@ -29,7 +29,8 @@
  * Convert a value to a time.
  * See SPEC.
  *
- * Example
+ * 
+ * Example
  * 
  *  Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToUIntFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToUIntFlux.java
index 75d6f4e2ee3..bb60f3cab12 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToUIntFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/ToUIntFlux.java
@@ -29,7 +29,8 @@
  * Convert a value to a duration.
  * See SPEC.
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TruncateTimeColumnFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TruncateTimeColumnFlux.java
index 5f60ada1c7f..c414465b0d5 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TruncateTimeColumnFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/TruncateTimeColumnFlux.java
@@ -30,12 +30,14 @@
 /**
  * Truncates all input time values in the _time to a specified unit..
  *
- * Options
+ * 
+ * Options
  * 

  * unit - Unit of time to truncate to. [unit].
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/WindowFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/WindowFlux.java
index d620290ee38..edfa80b3d41 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/WindowFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/WindowFlux.java
@@ -32,7 +32,8 @@
  * Groups the results by a given time range.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * every - Duration of time between windows. Defaults to period's value. [duration]
  * 
period - Duration of the windowed partition. Defaults to every's value. [duration]
@@ -44,7 +45,8 @@
  * 
stopColumn - Name of the column containing the window stop time. Defaults to _stop. [string]
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")
diff --git a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/YieldFlux.java b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/YieldFlux.java
index d743d8ffb0e..b4d4d97b159 100644
--- a/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/YieldFlux.java
+++ b/flux-dsl/src/main/java/com/influxdb/query/dsl/functions/YieldFlux.java
@@ -30,12 +30,14 @@
  * Yield a query results to yielded results.
  * See SPEC.
  *
- * Options
+ * 
+ * Options
  * 

  * name - The unique name to give to yielded results [string].
  * 
  *
- * Example
+ * 
+ * Example
  * 
  * Flux flux = Flux
  *     .from("telegraf")

From 262cdb2162bf9108ac8ee6f32b1988a895b97dc4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Sep 2022 06:29:57 +0200
Subject: [PATCH 06/55] chore(deps): bump versions-maven-plugin from 2.11.0 to
 2.12.0 (#413)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump versions-maven-plugin from 2.11.0 to 2.12.0

Bumps [versions-maven-plugin](https://github.com/mojohaus/versions-maven-plugin) from 2.11.0 to 2.12.0.
- [Release notes](https://github.com/mojohaus/versions-maven-plugin/releases)
- [Changelog](https://github.com/mojohaus/versions-maven-plugin/blob/master/ReleaseNotes.md)
- [Commits](https://github.com/mojohaus/versions-maven-plugin/compare/versions-maven-plugin-2.11.0...versions-maven-plugin-2.12.0)

---
updated-dependencies:
- dependency-name: org.codehaus.mojo:versions-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md | 3 +++
 pom.xml      | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c702cebd177..ee2d2995be0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@
 ### Dependencies
 Update dependencies:
 
+#### Maven Plugin:
+  - [#413](https://github.com/influxdata/influxdb-client-java/pull/413): `versions-maven-plugin` to `2.12.0`
+
 #### Test:
   - [#408](https://github.com/influxdata/influxdb-client-java/pull/408): `logback-classic` to `1.3.0`
 
diff --git a/pom.xml b/pom.xml
index 43079c9ad77..052608591f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,7 +372,7 @@
                 
                     org.codehaus.mojo
                     versions-maven-plugin
-                    2.11.0
+                    2.12.0
                 
 
                 
@@ -463,7 +463,7 @@
             
                 org.codehaus.mojo
                 versions-maven-plugin
-                2.7
+                2.12.0
                 
                     
                         

From c664c23682d5ecebed6fb8c7c66ab4397cbccf15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Sep 2022 08:34:07 +0200
Subject: [PATCH 07/55] chore(deps): bump akka.version from 2.6.19 to 2.6.20
 (#412)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump akka.version from 2.6.19 to 2.6.20

Bumps `akka.version` from 2.6.19 to 2.6.20.

Updates `akka-stream_2.13` from 2.6.19 to 2.6.20
- [Release notes](https://github.com/akka/akka/releases)
- [Commits](https://github.com/akka/akka/compare/v2.6.19...v2.6.20)

Updates `akka-testkit_2.13` from 2.6.19 to 2.6.20
- [Release notes](https://github.com/akka/akka/releases)
- [Commits](https://github.com/akka/akka/compare/v2.6.19...v2.6.20)

Updates `akka-stream-testkit_2.13` from 2.6.19 to 2.6.20
- [Release notes](https://github.com/akka/akka/releases)
- [Commits](https://github.com/akka/akka/compare/v2.6.19...v2.6.20)

---
updated-dependencies:
- dependency-name: com.typesafe.akka:akka-stream_2.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.typesafe.akka:akka-testkit_2.13
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: com.typesafe.akka:akka-stream-testkit_2.13
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md                    | 3 +++
 client-scala/cross/2.13/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee2d2995be0..b5eb1de72e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@
 ### Dependencies
 Update dependencies:
 
+#### Build:
+  - [#412](https://github.com/influxdata/influxdb-client-java/pull/412): `akka` to `2.6.20`
+  
 #### Maven Plugin:
   - [#413](https://github.com/influxdata/influxdb-client-java/pull/413): `versions-maven-plugin` to `2.12.0`
 
diff --git a/client-scala/cross/2.13/pom.xml b/client-scala/cross/2.13/pom.xml
index 0a44995b6c1..eb6f4aa861c 100644
--- a/client-scala/cross/2.13/pom.xml
+++ b/client-scala/cross/2.13/pom.xml
@@ -74,7 +74,7 @@
   
     1.4.11
     2.13.8
-    2.6.19
+    2.6.20
   
 
   

From a35772275119f75cae71e332c2271b49a430818c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Sep 2022 06:41:50 +0200
Subject: [PATCH 08/55] chore(deps): bump akka.version from 2.6.19 to 2.6.20
 (#416)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump akka.version from 2.6.19 to 2.6.20

Bumps `akka.version` from 2.6.19 to 2.6.20.

Updates `akka-stream_2.12` from 2.6.19 to 2.6.20
- [Release notes](https://github.com/akka/akka/releases)
- [Commits](https://github.com/akka/akka/compare/v2.6.19...v2.6.20)

Updates `akka-testkit_2.12` from 2.6.19 to 2.6.20
- [Release notes](https://github.com/akka/akka/releases)
- [Commits](https://github.com/akka/akka/compare/v2.6.19...v2.6.20)

Updates `akka-stream-testkit_2.12` from 2.6.19 to 2.6.20
- [Release notes](https://github.com/akka/akka/releases)
- [Commits](https://github.com/akka/akka/compare/v2.6.19...v2.6.20)

---
updated-dependencies:
- dependency-name: com.typesafe.akka:akka-stream_2.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.typesafe.akka:akka-testkit_2.12
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: com.typesafe.akka:akka-stream-testkit_2.12
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md                    | 2 +-
 client-scala/cross/2.12/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5eb1de72e3..7c235d4ef5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 Update dependencies:
 
 #### Build:
-  - [#412](https://github.com/influxdata/influxdb-client-java/pull/412): `akka` to `2.6.20`
+  - [#412](https://github.com/influxdata/influxdb-client-java/pull/412), [#416](https://github.com/influxdata/influxdb-client-java/pull/416): `akka` to `2.6.20`
   
 #### Maven Plugin:
   - [#413](https://github.com/influxdata/influxdb-client-java/pull/413): `versions-maven-plugin` to `2.12.0`
diff --git a/client-scala/cross/2.12/pom.xml b/client-scala/cross/2.12/pom.xml
index 61b1646af6d..4c997dd88aa 100644
--- a/client-scala/cross/2.12/pom.xml
+++ b/client-scala/cross/2.12/pom.xml
@@ -73,7 +73,7 @@
 
   
     2.12.16
-    2.6.19
+    2.6.20
   
 
   

From b410e4d3c3dce1b857319e7b3a6bb190a04098fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Sep 2022 08:35:06 +0200
Subject: [PATCH 09/55] chore(deps): bump mockito.version from 4.7.0 to 4.8.0
 (#417)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump mockito.version from 4.7.0 to 4.8.0

Bumps `mockito.version` from 4.7.0 to 4.8.0.

Updates `mockito-core` from 4.7.0 to 4.8.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0)

Updates `mockito-junit-jupiter` from 4.7.0 to 4.8.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.mockito:mockito-junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md | 1 +
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c235d4ef5c..c181b911b82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Update dependencies:
 
 #### Test:
   - [#408](https://github.com/influxdata/influxdb-client-java/pull/408): `logback-classic` to `1.3.0`
+  - [#417](https://github.com/influxdata/influxdb-client-java/pull/417): `mockito` to `4.8.0`
 
 ## 6.5.0 [2022-08-29]
 
diff --git a/pom.xml b/pom.xml
index 052608591f5..d0e677c62fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
         1.7.10
         5.9.0
         1.6.4
-        4.7.0
+        4.8.0
     
 
     

From 79836d86477610ba2476f4f0988f7dacb79b84d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 06:38:10 +0200
Subject: [PATCH 10/55] chore(deps): bump micrometer-registry-influx from 1.9.3
 to 1.9.4 (#420)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump micrometer-registry-influx from 1.9.3 to 1.9.4

Bumps [micrometer-registry-influx](https://github.com/micrometer-metrics/micrometer) from 1.9.3 to 1.9.4.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.9.3...v1.9.4)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-registry-influx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md   | 1 +
 spring/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c181b911b82..c52c73aba95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Update dependencies:
 
 #### Build:
   - [#412](https://github.com/influxdata/influxdb-client-java/pull/412), [#416](https://github.com/influxdata/influxdb-client-java/pull/416): `akka` to `2.6.20`
+  - [#420](https://github.com/influxdata/influxdb-client-java/pull/420): `micrometer-registry-influx` to `1.9.4`
   
 #### Maven Plugin:
   - [#413](https://github.com/influxdata/influxdb-client-java/pull/413): `versions-maven-plugin` to `2.12.0`
diff --git a/spring/pom.xml b/spring/pom.xml
index 83c0fe6eb62..d1dfe6a8091 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -72,7 +72,7 @@
   
 
     
-        1.9.3
+        1.9.4
         2.7.3
         5.3.22
     

From 6be98b37087016cafdc7e3e22dd53a5c6a6d18db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 08:22:24 +0200
Subject: [PATCH 11/55] chore(deps): bump slf4j-api from 2.0.0 to 2.0.1 (#424)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump slf4j-api from 2.0.0 to 2.0.1

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.0...v_2.0.1)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md        | 3 +++
 client-osgi/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c52c73aba95..a429e38eff2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,9 @@ Update dependencies:
 #### Maven Plugin:
   - [#413](https://github.com/influxdata/influxdb-client-java/pull/413): `versions-maven-plugin` to `2.12.0`
 
+#### Provided:
+  - [#424](https://github.com/influxdata/influxdb-client-java/pull/424): `slf4j-api` to `2.0.1`
+
 #### Test:
   - [#408](https://github.com/influxdata/influxdb-client-java/pull/408): `logback-classic` to `1.3.0`
   - [#417](https://github.com/influxdata/influxdb-client-java/pull/417): `mockito` to `4.8.0`
diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml
index 3abb0dce32a..faa2fbc4813 100644
--- a/client-osgi/pom.xml
+++ b/client-osgi/pom.xml
@@ -151,7 +151,7 @@
         
             org.slf4j
             slf4j-api
-            2.0.0
+            2.0.1
             provided
         
 

From ff90e5e3db899315f5290e419d264db0edb5f8f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 08:22:42 +0200
Subject: [PATCH 12/55] chore(deps): bump scala-library from 2.12.16 to 2.12.17
 (#423)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump scala-library from 2.12.16 to 2.12.17

Bumps [scala-library](https://github.com/scala/scala) from 2.12.16 to 2.12.17.
- [Release notes](https://github.com/scala/scala/releases)
- [Commits](https://github.com/scala/scala/compare/v2.12.16...v2.12.17)

---
updated-dependencies:
- dependency-name: org.scala-lang:scala-library
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* chore: revert for 2.13

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md                    | 1 +
 client-scala/cross/2.12/pom.xml | 2 +-
 client-scala/cross/2.13/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a429e38eff2..3eb9709e27d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Update dependencies:
 #### Build:
   - [#412](https://github.com/influxdata/influxdb-client-java/pull/412), [#416](https://github.com/influxdata/influxdb-client-java/pull/416): `akka` to `2.6.20`
   - [#420](https://github.com/influxdata/influxdb-client-java/pull/420): `micrometer-registry-influx` to `1.9.4`
+  - [#423](https://github.com/influxdata/influxdb-client-java/pull/423): `scala-library` to `2.12.17`
   
 #### Maven Plugin:
   - [#413](https://github.com/influxdata/influxdb-client-java/pull/413): `versions-maven-plugin` to `2.12.0`
diff --git a/client-scala/cross/2.12/pom.xml b/client-scala/cross/2.12/pom.xml
index 4c997dd88aa..213a793c865 100644
--- a/client-scala/cross/2.12/pom.xml
+++ b/client-scala/cross/2.12/pom.xml
@@ -72,7 +72,7 @@
   
 
   
-    2.12.16
+    2.12.17
     2.6.20
   
 
diff --git a/client-scala/cross/2.13/pom.xml b/client-scala/cross/2.13/pom.xml
index eb6f4aa861c..80b3ebfd50e 100644
--- a/client-scala/cross/2.13/pom.xml
+++ b/client-scala/cross/2.13/pom.xml
@@ -270,4 +270,4 @@
 
   
 
-
\ No newline at end of file
+

From a5d9a27d177d71907f0f311124267d44ba18cff0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Sep 2022 09:20:51 +0200
Subject: [PATCH 13/55] chore(deps-dev): bump logback-classic from 1.3.0 to
 1.3.1 (#422)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps-dev): bump logback-classic from 1.3.0 to 1.3.1

Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/commits)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md        | 2 +-
 client-osgi/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3eb9709e27d..cdeaadd3974 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ Update dependencies:
   - [#424](https://github.com/influxdata/influxdb-client-java/pull/424): `slf4j-api` to `2.0.1`
 
 #### Test:
-  - [#408](https://github.com/influxdata/influxdb-client-java/pull/408): `logback-classic` to `1.3.0`
+  - [#422](https://github.com/influxdata/influxdb-client-java/pull/422): `logback-classic` to `1.3.1`
   - [#417](https://github.com/influxdata/influxdb-client-java/pull/417): `mockito` to `4.8.0`
 
 ## 6.5.0 [2022-08-29]
diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml
index faa2fbc4813..5450748b3ce 100644
--- a/client-osgi/pom.xml
+++ b/client-osgi/pom.xml
@@ -191,7 +191,7 @@
         
             ch.qos.logback
             logback-classic
-            1.3.0
+            1.3.1
             test
             
                 

From f377905005b9f7fc7640549c621f6f33d06d793c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Bedn=C3=A1=C5=99?= 
Date: Thu, 15 Sep 2022 13:56:13 +0200
Subject: [PATCH 14/55] feat: add possibility to get time from `Point` (#419)

---
 CHANGELOG.md                                        |  3 +++
 .../main/java/com/influxdb/client/write/Point.java  |  8 ++++++++
 .../java/com/influxdb/client/write/PointTest.java   | 13 +++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdeaadd3974..94c8425526e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## 6.6.0 [unreleased]
 
+### Features
+1. [#419](https://github.com/influxdata/influxdb-client-java/pull/419): Add possibility to get time from `Point` data structure
+
 ### Documentation
 1. [#406](https://github.com/influxdata/influxdb-client-java/pull/406): Fix compatibility of the `doclint` between JDK 8 and JDK 18
 
diff --git a/client/src/main/java/com/influxdb/client/write/Point.java b/client/src/main/java/com/influxdb/client/write/Point.java
index 394d288982f..cc0d38c4d25 100644
--- a/client/src/main/java/com/influxdb/client/write/Point.java
+++ b/client/src/main/java/com/influxdb/client/write/Point.java
@@ -253,6 +253,14 @@ public Point time(@Nullable final Long time, @Nonnull final WritePrecision preci
         return time((Number) time, precision);
     }
 
+    /**
+     * @return the data point timestamp
+     */
+    @Nullable
+    public Number getTime() {
+        return time;
+    }
+
     /**
      * @return the data point precision
      */
diff --git a/client/src/test/java/com/influxdb/client/write/PointTest.java b/client/src/test/java/com/influxdb/client/write/PointTest.java
index 5b7adcc300f..2f5c9f68b82 100644
--- a/client/src/test/java/com/influxdb/client/write/PointTest.java
+++ b/client/src/test/java/com/influxdb/client/write/PointTest.java
@@ -293,6 +293,19 @@ void timeInstantNull() {
         Assertions.assertThat(point.toLineProtocol()).isEqualTo("h2o,location=europe level=2i");
     }
 
+    @Test
+    void timeGetTime() {
+
+        Instant time = Instant.parse("2022-06-12T10:26:03.800123456Z");
+
+        Point point = Point.measurement("h2o")
+                .addTag("location", "europe")
+                .addField("level", 2)
+                .time(time, WritePrecision.NS);
+
+        Assertions.assertThat(point.getTime()).isEqualTo(BigInteger.valueOf(1655029563800123456L));
+    }
+
     @Test
     void defaultTags() {
 

From 5712b484f4874fada6fbd05454ef78b342f547d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Bedn=C3=A1=C5=99?= 
Date: Thu, 15 Sep 2022 15:13:05 +0200
Subject: [PATCH 15/55] chore(test): remove deprecated `junit-platform-runner`
 (#418)

---
 CHANGELOG.md                                  |  4 +++
 client-core/pom.xml                           | 10 ------
 .../exceptions/InfluxExceptionTest.java       |  3 --
 .../internal/ITUserAgentInterceptor.java      |  3 --
 .../internal/QueryAbstractApiTest.java        |  5 +--
 .../com/influxdb/internal/RestClientTest.java |  3 --
 .../query/internal/FluxCsvParserTest.java     |  3 --
 .../query/internal/FluxResultMapperTest.java  |  3 --
 .../FluxStructureSerializationTest.java       |  3 --
 .../client/kotlin/ITInfluxDBClientKotlin.kt   |  3 --
 .../client/kotlin/ITQueryKotlinApi.kt         |  3 --
 .../kotlin/InfluxDBClientKotlinFactoryTest.kt |  3 --
 .../client/kotlin/InfluxDBClientKotlinTest.kt |  3 --
 .../client/kotlin/WriteKotlinApiTest.kt       |  4 ---
 .../client/flux/FluxClientFactoryTest.java    |  3 --
 .../client/flux/FluxClientPingTest.java       |  3 --
 .../client/flux/FluxClientQueryRawTest.java   |  3 --
 .../client/flux/FluxClientQueryTest.java      |  3 --
 .../client/flux/FluxClientVersionTest.java    |  3 --
 .../flux/FluxConnectionOptionsTest.java       |  3 --
 .../influxdb/client/flux/ITFluxClient.java    |  3 --
 .../client/flux/TestConnectionString.java     |  3 --
 .../client/osgi/ITConnectionTest.java         |  4 ---
 .../client/osgi/InfluxDBConnectorTest.java    | 10 +++---
 .../client/osgi/LineProtocolWriterTest.java   |  9 +++---
 .../influxdb/client/osgi/PointWriterTest.java | 32 ++++++++++++-------
 .../reactive/ITInfluxDBReactiveClient.java    |  3 --
 .../reactive/ITWriteQueryReactiveApi.java     |  5 ---
 .../InfluxDBClientReactiveFactoryTest.java    |  3 --
 .../client/reactive/QueryReactiveApiTest.java |  3 --
 .../reactive/WriteOptionsReactiveTest.java    |  3 --
 .../client/reactive/WriteReactiveApiTest.java |  3 --
 client-test/pom.xml                           |  9 ------
 client-utils/pom.xml                          |  6 ----
 .../influxdb/utils/ArgumentsDurationTest.java |  3 --
 .../com/influxdb/utils/ArgumentsTest.java     |  3 --
 .../com/influxdb/client/FindOptionsTest.java  |  3 --
 .../influxdb/client/GeneratedCodeTest.java    |  3 --
 .../influxdb/client/ITAuthorizationsApi.java  |  3 --
 .../com/influxdb/client/ITBackpressure.java   |  3 --
 .../com/influxdb/client/ITBenchmarkTest.java  |  4 +--
 .../com/influxdb/client/ITBucketsApi.java     |  3 --
 .../java/com/influxdb/client/ITChecksApi.java |  3 --
 .../com/influxdb/client/ITDashboardsApi.java  |  3 --
 .../java/com/influxdb/client/ITDeleteApi.java |  3 --
 .../com/influxdb/client/ITInfluxDBClient.java |  4 ---
 .../influxdb/client/ITInfluxQLQueryApi.java   |  3 --
 .../java/com/influxdb/client/ITLabelsApi.java |  3 --
 .../influxdb/client/ITMonitoringAlerting.java |  3 --
 .../client/ITNotificationEndpointsApi.java    |  3 --
 .../client/ITNotificationRulesApi.java        |  3 --
 .../influxdb/client/ITOrganizationsApi.java   |  3 --
 .../com/influxdb/client/ITQueryService.java   |  3 --
 .../influxdb/client/ITScraperTargetsApi.java  |  3 --
 .../com/influxdb/client/ITSourcesApi.java     |  3 --
 .../java/com/influxdb/client/ITTasksApi.java  |  3 --
 .../com/influxdb/client/ITTelegrafsApi.java   |  3 --
 .../java/com/influxdb/client/ITUsersApi.java  |  3 --
 .../com/influxdb/client/ITVariablesApi.java   |  3 --
 .../influxdb/client/ITWriteApiBlocking.java   |  3 --
 .../com/influxdb/client/ITWriteQueryApi.java  |  3 --
 .../client/InfluxDBClientFactoryTest.java     |  3 --
 .../client/InfluxDBClientOptionsTest.java     |  3 --
 .../influxdb/client/InfluxDBClientTest.java   |  3 --
 .../client/InvokableScriptsApiTest.java       |  3 --
 .../com/influxdb/client/QueryApiTest.java     |  8 ++---
 .../influxdb/client/WriteApiBlockingTest.java |  3 --
 .../com/influxdb/client/WriteApiTest.java     |  3 --
 .../com/influxdb/client/WriteOptionsTest.java |  3 --
 .../internal/AuthenticateInterceptorTest.java |  3 --
 .../client/internal/GzipInterceptorTest.java  |  3 --
 .../internal/MeasurementMapperTest.java       |  3 --
 .../client/internal/RetryAttemptTest.java     |  3 --
 .../client/internal/WaitToConditionTest.java  |  3 --
 ...BackpressureBatchesBufferStrategyTest.java |  3 --
 .../FlowableBufferTimedFlushableTest.java     |  3 --
 .../client/write/PointSettingsTest.java       |  3 --
 .../com/influxdb/client/write/PointTest.java  |  3 --
 .../client/write/WriteParametersTest.java     |  3 --
 .../java/com/example/flux/CustomFunction.java |  3 --
 .../query/dsl/AbstractFunctionFluxTest.java   |  4 +--
 .../java/com/influxdb/query/dsl/FluxTest.java |  3 --
 .../dsl/functions/AggregateWindowTest.java    |  4 +--
 .../dsl/functions/ArrayFromFluxTest.java      |  4 +--
 .../query/dsl/functions/ColumnsFluxTest.java  |  3 --
 .../query/dsl/functions/CountFluxTest.java    |  3 --
 .../dsl/functions/CovarianceFluxTest.java     |  3 --
 .../dsl/functions/CumulativeSumFluxTest.java  |  3 --
 .../dsl/functions/DerivativeFluxTest.java     |  3 --
 .../dsl/functions/DifferenceFluxTest.java     |  3 --
 .../query/dsl/functions/DistinctFluxTest.java |  3 --
 .../query/dsl/functions/DropFluxTest.java     |  3 --
 .../dsl/functions/DuplicateFluxTest.java      |  3 --
 .../dsl/functions/ExpressionFluxTest.java     |  3 --
 .../query/dsl/functions/FillFluxTest.java     |  4 +--
 .../query/dsl/functions/FilterFluxTest.java   |  3 --
 .../query/dsl/functions/FirstFluxTest.java    |  5 ---
 .../query/dsl/functions/FromFluxTest.java     |  3 --
 .../query/dsl/functions/GroupFluxTest.java    |  3 --
 .../query/dsl/functions/IntegralFluxTest.java |  3 --
 .../dsl/functions/InterpolateLinearTest.java  |  4 +--
 .../query/dsl/functions/JoinFluxTest.java     |  3 --
 .../query/dsl/functions/KeepFluxTest.java     |  3 --
 .../query/dsl/functions/LastFluxTest.java     |  3 --
 .../query/dsl/functions/LimitFluxTest.java    |  3 --
 .../query/dsl/functions/MapFluxTest.java      |  3 --
 .../query/dsl/functions/MaxFluxTest.java      |  3 --
 .../query/dsl/functions/MeanFluxTest.java     |  3 --
 .../query/dsl/functions/MinFluxTest.java      |  3 --
 .../query/dsl/functions/PivotFluxTest.java    |  3 --
 .../query/dsl/functions/QuantileFluxTest.java |  5 ---
 .../query/dsl/functions/RangeFluxTest.java    |  3 --
 .../query/dsl/functions/ReduceFluxTest.java   |  3 --
 .../query/dsl/functions/RenameFluxTest.java   |  3 --
 .../query/dsl/functions/SampleFluxTest.java   |  3 --
 .../query/dsl/functions/SetFluxTest.java      |  3 --
 .../query/dsl/functions/SkewFluxTest.java     |  3 --
 .../query/dsl/functions/SortFluxTest.java     |  3 --
 .../query/dsl/functions/SpreadFluxTest.java   |  3 --
 .../query/dsl/functions/StddevFluxTest.java   |  3 --
 .../query/dsl/functions/SumFluxTest.java      |  3 --
 .../query/dsl/functions/TailFluxTest.java     |  3 --
 .../dsl/functions/TimeShiftFluxTest.java      |  3 --
 .../query/dsl/functions/ToBoolFluxTest.java   |  3 --
 .../dsl/functions/ToDurationFluxTest.java     |  3 --
 .../query/dsl/functions/ToFloatFluxTest.java  |  3 --
 .../query/dsl/functions/ToFluxTest.java       |  3 --
 .../query/dsl/functions/ToIntFluxTest.java    |  3 --
 .../query/dsl/functions/ToStringFluxTest.java |  3 --
 .../query/dsl/functions/ToTimeFluxTest.java   |  3 --
 .../query/dsl/functions/ToUIntFluxTest.java   |  3 --
 .../dsl/functions/TruncateTimeColumnTest.java |  4 +--
 .../query/dsl/functions/UnionFluxTest.java    |  4 +--
 .../query/dsl/functions/WindowFluxTest.java   |  3 --
 .../query/dsl/functions/YieldFluxTest.java    |  3 --
 .../properties/TimeIntervalTest.java          |  3 --
 .../restriction/RestrictionsTest.java         | 10 +++---
 pom.xml                                       | 20 ++++++++----
 spring/pom.xml                                |  6 ----
 ...2HealthIndicatorAutoConfigurationTest.java |  3 --
 ...nfluxDB2AutoConfigurationReactiveTest.java |  3 --
 .../InfluxDB2AutoConfigurationTest.java       |  3 --
 142 files changed, 63 insertions(+), 473 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94c8425526e..8800a8c9ca9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,10 @@ Update dependencies:
 #### Test:
   - [#422](https://github.com/influxdata/influxdb-client-java/pull/422): `logback-classic` to `1.3.1`
   - [#417](https://github.com/influxdata/influxdb-client-java/pull/417): `mockito` to `4.8.0`
+               
+Remove dependencies:
+#### Test:
+  - [#418](https://github.com/influxdata/influxdb-client-java/pull/418): `junit-platform-runner`
 
 ## 6.5.0 [2022-08-29]
 
diff --git a/client-core/pom.xml b/client-core/pom.xml
index 4cc8cda6dd4..79b63399f0f 100644
--- a/client-core/pom.xml
+++ b/client-core/pom.xml
@@ -171,10 +171,6 @@
             com.squareup.okhttp3
             mockwebserver
             
-                
-                    junit
-                    junit
-                
                 
                     com.squareup.okhttp3
                     okhttp
@@ -193,12 +189,6 @@
             test
         
 
-        
-            org.junit.platform
-            junit-platform-runner
-            test
-        
-
         
             org.assertj
             assertj-core
diff --git a/client-core/src/test/java/com/influxdb/exceptions/InfluxExceptionTest.java b/client-core/src/test/java/com/influxdb/exceptions/InfluxExceptionTest.java
index 941f07986a3..df1619a379f 100644
--- a/client-core/src/test/java/com/influxdb/exceptions/InfluxExceptionTest.java
+++ b/client-core/src/test/java/com/influxdb/exceptions/InfluxExceptionTest.java
@@ -34,15 +34,12 @@
 import okhttp3.ResponseBody;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import retrofit2.HttpException;
 import retrofit2.Response;
 
 /**
  * @author Jakub Bednar (bednar@github) (02/08/2018 08:58)
  */
-@RunWith(JUnitPlatform.class)
 class InfluxExceptionTest {
 
     @Test
diff --git a/client-core/src/test/java/com/influxdb/internal/ITUserAgentInterceptor.java b/client-core/src/test/java/com/influxdb/internal/ITUserAgentInterceptor.java
index aa1afc2f49c..20c38a35c05 100644
--- a/client-core/src/test/java/com/influxdb/internal/ITUserAgentInterceptor.java
+++ b/client-core/src/test/java/com/influxdb/internal/ITUserAgentInterceptor.java
@@ -33,13 +33,10 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (02/03/2020 10:18)
  */
-@RunWith(JUnitPlatform.class)
 class ITUserAgentInterceptor extends AbstractMockServerTest {
 
     private OkHttpClient client;
diff --git a/client-core/src/test/java/com/influxdb/internal/QueryAbstractApiTest.java b/client-core/src/test/java/com/influxdb/internal/QueryAbstractApiTest.java
index a7401f71c19..b63bf74f1a8 100644
--- a/client-core/src/test/java/com/influxdb/internal/QueryAbstractApiTest.java
+++ b/client-core/src/test/java/com/influxdb/internal/QueryAbstractApiTest.java
@@ -27,12 +27,12 @@
 import java.util.function.BiConsumer;
 import javax.annotation.Nonnull;
 
-import com.google.gson.JsonParser;
 import com.influxdb.Cancellable;
 import com.influxdb.exceptions.InfluxException;
 import com.influxdb.query.internal.FluxCsvParser;
 import com.influxdb.test.AbstractMockServerTest;
 
+import com.google.gson.JsonParser;
 import okhttp3.OkHttpClient;
 import okhttp3.RequestBody;
 import okhttp3.ResponseBody;
@@ -41,8 +41,6 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import retrofit2.Call;
 import retrofit2.Retrofit;
 import retrofit2.http.Body;
@@ -53,7 +51,6 @@
 /**
  * @author Jakub Bednar (bednar@github) (17/10/2018 09:44)
  */
-@RunWith(JUnitPlatform.class)
 class QueryAbstractApiTest extends AbstractMockServerTest {
 
     private AbstractQueryApi queryClient;
diff --git a/client-core/src/test/java/com/influxdb/internal/RestClientTest.java b/client-core/src/test/java/com/influxdb/internal/RestClientTest.java
index 3db33d8759f..0da95f5be9d 100644
--- a/client-core/src/test/java/com/influxdb/internal/RestClientTest.java
+++ b/client-core/src/test/java/com/influxdb/internal/RestClientTest.java
@@ -58,8 +58,6 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import retrofit2.Call;
 import retrofit2.Response;
 import retrofit2.Retrofit;
@@ -70,7 +68,6 @@
 /**
  * @author Jakub Bednar (bednar@github) (04/10/2018 07:57)
  */
-@RunWith(JUnitPlatform.class)
 class RestClientTest extends AbstractMockServerTest {
 
     private AbstractRestClient restClient;
diff --git a/client-core/src/test/java/com/influxdb/query/internal/FluxCsvParserTest.java b/client-core/src/test/java/com/influxdb/query/internal/FluxCsvParserTest.java
index b98a6d9c93c..11f55fea1d9 100644
--- a/client-core/src/test/java/com/influxdb/query/internal/FluxCsvParserTest.java
+++ b/client-core/src/test/java/com/influxdb/query/internal/FluxCsvParserTest.java
@@ -44,15 +44,12 @@
 import org.assertj.core.util.Lists;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
  * @author Jakub Bednar (bednar@github) (16/07/2018 12:26)
  */
-@RunWith(JUnitPlatform.class)
 class FluxCsvParserTest {
 
     private static final Logger LOG = Logger.getLogger(FluxCsvParserTest.class.getName());
diff --git a/client-core/src/test/java/com/influxdb/query/internal/FluxResultMapperTest.java b/client-core/src/test/java/com/influxdb/query/internal/FluxResultMapperTest.java
index f2e41b05ee5..4c8ef932490 100644
--- a/client-core/src/test/java/com/influxdb/query/internal/FluxResultMapperTest.java
+++ b/client-core/src/test/java/com/influxdb/query/internal/FluxResultMapperTest.java
@@ -30,13 +30,10 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (01/02/2019 09:01)
  */
-@RunWith(JUnitPlatform.class)
 class FluxResultMapperTest {
 
     private FluxResultMapper mapper;
diff --git a/client-core/src/test/java/com/influxdb/query/internal/FluxStructureSerializationTest.java b/client-core/src/test/java/com/influxdb/query/internal/FluxStructureSerializationTest.java
index e7fb7339388..ace20b5547f 100644
--- a/client-core/src/test/java/com/influxdb/query/internal/FluxStructureSerializationTest.java
+++ b/client-core/src/test/java/com/influxdb/query/internal/FluxStructureSerializationTest.java
@@ -35,10 +35,7 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 class FluxStructureSerializationTest {
 
     @Test
diff --git a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITInfluxDBClientKotlin.kt b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITInfluxDBClientKotlin.kt
index 75f0754d060..cc67fed6d8f 100644
--- a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITInfluxDBClientKotlin.kt
+++ b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITInfluxDBClientKotlin.kt
@@ -26,14 +26,11 @@ import com.influxdb.client.domain.HealthCheck
 import com.influxdb.exceptions.InfluxException
 import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.Test
-import org.junit.platform.runner.JUnitPlatform
-import org.junit.runner.RunWith
 
 
 /**
  * @author Jakub Bednar (bednar@github) (30/10/2018 09:19)
  */
-@RunWith(JUnitPlatform::class)
 internal class ITInfluxDBClientKotlin : AbstractITInfluxDBClientKotlin() {
 
     @Test
diff --git a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt
index cb2e5a18ca1..ad717df6dd2 100644
--- a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt
+++ b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt
@@ -46,8 +46,6 @@ import kotlinx.coroutines.channels.toList
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.platform.runner.JUnitPlatform
-import org.junit.runner.RunWith
 import java.net.ConnectException
 import java.time.Instant
 import java.util.*
@@ -55,7 +53,6 @@ import java.util.*
 /**
  * @author Jakub Bednar (bednar@github) (31/10/2018 07:16)
  */
-@RunWith(JUnitPlatform::class)
 internal class ITQueryKotlinApi : AbstractITInfluxDBClientKotlin() {
 
     private lateinit var bucket: Bucket
diff --git a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinFactoryTest.kt b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinFactoryTest.kt
index 7786b0f5222..5bc9bfac7d5 100644
--- a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinFactoryTest.kt
+++ b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinFactoryTest.kt
@@ -29,14 +29,11 @@ import okhttp3.OkHttpClient
 import org.assertj.core.api.Assertions
 import org.assertj.core.api.AssertionsForClassTypes
 import org.junit.jupiter.api.Test
-import org.junit.platform.runner.JUnitPlatform
-import org.junit.runner.RunWith
 import retrofit2.Retrofit
 
 /**
  * @author Jakub Bednar (bednar@github) (30/10/2018 08:32)
  */
-@RunWith(JUnitPlatform::class)
 class InfluxDBClientKotlinFactoryTest : AbstractTest() {
 
     @Test
diff --git a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinTest.kt b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinTest.kt
index 3ec4fb6a8e9..b1e99fed4fd 100644
--- a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinTest.kt
+++ b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/InfluxDBClientKotlinTest.kt
@@ -26,14 +26,11 @@ import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.platform.runner.JUnitPlatform
-import org.junit.runner.RunWith
 import java.util.concurrent.TimeUnit
 
 /**
  * @author Jakub Bednar (09/06/2020 07:11)
  */
-@RunWith(JUnitPlatform::class)
 class InfluxDBClientKotlinTest : AbstractMockServerTest() {
 
     private lateinit var client: InfluxDBClientKotlin
diff --git a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/WriteKotlinApiTest.kt b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/WriteKotlinApiTest.kt
index 1c8c8d2c0ef..fb1ac84a4a7 100644
--- a/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/WriteKotlinApiTest.kt
+++ b/client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/WriteKotlinApiTest.kt
@@ -29,7 +29,6 @@ import com.influxdb.exceptions.UnauthorizedException
 import com.influxdb.test.AbstractMockServerTest
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.asFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.runBlocking
 import okhttp3.mockwebserver.RecordedRequest
@@ -37,15 +36,12 @@ import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.platform.runner.JUnitPlatform
-import org.junit.runner.RunWith
 import java.time.Instant
 import java.util.concurrent.TimeUnit
 
 /**
  * @author Jakub Bednar (20/04/2021 13:58)
  */
-@RunWith(JUnitPlatform::class)
 class WriteKotlinApiTest : AbstractMockServerTest() {
 
     private lateinit var client: InfluxDBClientKotlin
diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientFactoryTest.java b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientFactoryTest.java
index b93de267956..a660cc1b26d 100644
--- a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientFactoryTest.java
+++ b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientFactoryTest.java
@@ -23,13 +23,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (31/07/2018 13:12)
  */
-@RunWith(JUnitPlatform.class)
 class FluxClientFactoryTest {
 
     @Test
diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientPingTest.java b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientPingTest.java
index 4cd7ff6b633..5545d391b45 100644
--- a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientPingTest.java
+++ b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientPingTest.java
@@ -26,13 +26,10 @@
 import okhttp3.mockwebserver.MockResponse;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (31/07/2018 09:19)
  */
-@RunWith(JUnitPlatform.class)
 class FluxClientPingTest extends AbstractFluxClientTest {
 
     @Test
diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryRawTest.java b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryRawTest.java
index 2966a0327d6..b0c57b6920c 100644
--- a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryRawTest.java
+++ b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryRawTest.java
@@ -33,13 +33,10 @@
 import okhttp3.mockwebserver.MockResponse;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (03/08/2018 12:14)
  */
-@RunWith(JUnitPlatform.class)
 class FluxClientQueryRawTest extends AbstractFluxClientTest {
 
     @Test
diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryTest.java b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryTest.java
index 50efbbcf0a7..756d683279f 100644
--- a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryTest.java
+++ b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientQueryTest.java
@@ -34,13 +34,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (31/07/2018 07:05)
  */
-@RunWith(JUnitPlatform.class)
 class FluxClientQueryTest extends AbstractFluxClientTest {
 
     @Test
diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientVersionTest.java b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientVersionTest.java
index 64bd3e3870e..85f426ee523 100644
--- a/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientVersionTest.java
+++ b/client-legacy/src/test/java/com/influxdb/client/flux/FluxClientVersionTest.java
@@ -28,13 +28,10 @@
 import okhttp3.mockwebserver.MockResponse;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (03/10/2018 15:08)
  */
-@RunWith(JUnitPlatform.class)
 class FluxClientVersionTest extends AbstractFluxClientTest {
 
     @Test
diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/FluxConnectionOptionsTest.java b/client-legacy/src/test/java/com/influxdb/client/flux/FluxConnectionOptionsTest.java
index 58a8309c1a1..827fe194f20 100644
--- a/client-legacy/src/test/java/com/influxdb/client/flux/FluxConnectionOptionsTest.java
+++ b/client-legacy/src/test/java/com/influxdb/client/flux/FluxConnectionOptionsTest.java
@@ -27,13 +27,10 @@
 import okhttp3.Protocol;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (26/06/2018 09:09)
  */
-@RunWith(JUnitPlatform.class)
 class FluxConnectionOptionsTest {
 
     @Test
diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/ITFluxClient.java b/client-legacy/src/test/java/com/influxdb/client/flux/ITFluxClient.java
index be3b47bf401..899b3f5b415 100644
--- a/client-legacy/src/test/java/com/influxdb/client/flux/ITFluxClient.java
+++ b/client-legacy/src/test/java/com/influxdb/client/flux/ITFluxClient.java
@@ -38,13 +38,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (31/07/2018 09:30)
  */
-@RunWith(JUnitPlatform.class)
 class ITFluxClient extends AbstractITFluxClient {
 
     private static final Logger LOG = Logger.getLogger(ITFluxClient.class.getName());
diff --git a/client-legacy/src/test/java/com/influxdb/client/flux/TestConnectionString.java b/client-legacy/src/test/java/com/influxdb/client/flux/TestConnectionString.java
index 844c5826668..1a182bf0c29 100644
--- a/client-legacy/src/test/java/com/influxdb/client/flux/TestConnectionString.java
+++ b/client-legacy/src/test/java/com/influxdb/client/flux/TestConnectionString.java
@@ -26,10 +26,7 @@
 import okhttp3.OkHttpClient;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 class TestConnectionString extends AbstractITFluxClient {
     @Test
     void connectionStringTest() {
diff --git a/client-osgi/src/test/java/com/influxdb/client/osgi/ITConnectionTest.java b/client-osgi/src/test/java/com/influxdb/client/osgi/ITConnectionTest.java
index 7f4e2593fb0..dd4be830808 100644
--- a/client-osgi/src/test/java/com/influxdb/client/osgi/ITConnectionTest.java
+++ b/client-osgi/src/test/java/com/influxdb/client/osgi/ITConnectionTest.java
@@ -21,15 +21,11 @@
  */
 package com.influxdb.client.osgi;
 
-import com.influxdb.client.domain.HealthCheck;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-@RunWith(JUnitPlatform.class)
 public class ITConnectionTest extends InfluxDBConnectorTest {
 
     @Test
diff --git a/client-osgi/src/test/java/com/influxdb/client/osgi/InfluxDBConnectorTest.java b/client-osgi/src/test/java/com/influxdb/client/osgi/InfluxDBConnectorTest.java
index b243aacf032..e2b9e5edf6a 100644
--- a/client-osgi/src/test/java/com/influxdb/client/osgi/InfluxDBConnectorTest.java
+++ b/client-osgi/src/test/java/com/influxdb/client/osgi/InfluxDBConnectorTest.java
@@ -21,13 +21,15 @@
  */
 package com.influxdb.client.osgi;
 
+import java.util.Dictionary;
+import java.util.Hashtable;
+
 import com.influxdb.client.InfluxDBClient;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
@@ -35,9 +37,6 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
-import java.util.Dictionary;
-import java.util.Hashtable;
-
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -45,7 +44,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(JUnitPlatform.class)
 @ExtendWith(MockitoExtension.class)
 public class InfluxDBConnectorTest {
 
diff --git a/client-osgi/src/test/java/com/influxdb/client/osgi/LineProtocolWriterTest.java b/client-osgi/src/test/java/com/influxdb/client/osgi/LineProtocolWriterTest.java
index 5ed48dccce4..6481002b675 100644
--- a/client-osgi/src/test/java/com/influxdb/client/osgi/LineProtocolWriterTest.java
+++ b/client-osgi/src/test/java/com/influxdb/client/osgi/LineProtocolWriterTest.java
@@ -21,20 +21,20 @@
  */
 package com.influxdb.client.osgi;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import com.influxdb.client.InfluxDBClient;
-import com.influxdb.client.WriteApi;
 import com.influxdb.client.WriteApiBlocking;
 import com.influxdb.client.domain.WritePrecision;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
@@ -54,7 +54,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(JUnitPlatform.class)
 @ExtendWith(MockitoExtension.class)
 public class LineProtocolWriterTest {
 
diff --git a/client-osgi/src/test/java/com/influxdb/client/osgi/PointWriterTest.java b/client-osgi/src/test/java/com/influxdb/client/osgi/PointWriterTest.java
index bb6a5e9d0a5..bd20529e10f 100644
--- a/client-osgi/src/test/java/com/influxdb/client/osgi/PointWriterTest.java
+++ b/client-osgi/src/test/java/com/influxdb/client/osgi/PointWriterTest.java
@@ -21,17 +21,29 @@
  */
 package com.influxdb.client.osgi;
 
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.Supplier;
+import java.util.stream.IntStream;
+
 import com.influxdb.client.InfluxDBClient;
-import com.influxdb.client.WriteApi;
 import com.influxdb.client.WriteApiBlocking;
 import com.influxdb.client.domain.WritePrecision;
 import com.influxdb.client.write.Point;
+
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
@@ -39,20 +51,18 @@
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventConstants;
 
-import java.time.*;
-import java.util.*;
-import java.util.function.Supplier;
-import java.util.stream.IntStream;
-
 import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.hamcrest.core.AllOf.allOf;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
-@RunWith(JUnitPlatform.class)
 @ExtendWith(MockitoExtension.class)
 public class PointWriterTest {
 
diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java b/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java
index c6ad71c3650..bbb118922bc 100644
--- a/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java
+++ b/client-reactive/src/test/java/com/influxdb/client/reactive/ITInfluxDBReactiveClient.java
@@ -27,14 +27,11 @@
 import io.reactivex.rxjava3.core.Single;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.reactivestreams.Publisher;
 
 /**
  * @author Jakub Bednar (bednar@github) (20/11/2018 08:06)
  */
-@RunWith(JUnitPlatform.class)
 class ITInfluxDBReactiveClient extends AbstractITInfluxDBClientTest {
 
     @Test
diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java
index 1402a7f153c..86b0bed50de 100644
--- a/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java
+++ b/client-reactive/src/test/java/com/influxdb/client/reactive/ITWriteQueryReactiveApi.java
@@ -41,23 +41,18 @@
 import com.influxdb.exceptions.BadRequestException;
 import com.influxdb.query.FluxRecord;
 
-
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.reactivestreams.Publisher;
 
 /**
  * @author Jakub Bednar (bednar@github) (22/11/2018 06:59)
  */
-@RunWith(JUnitPlatform.class)
 class ITWriteQueryReactiveApi extends AbstractITInfluxDBClientTest {
 
     private WriteReactiveApi writeClient;
diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/InfluxDBClientReactiveFactoryTest.java b/client-reactive/src/test/java/com/influxdb/client/reactive/InfluxDBClientReactiveFactoryTest.java
index 13072eac936..fa0288697d0 100644
--- a/client-reactive/src/test/java/com/influxdb/client/reactive/InfluxDBClientReactiveFactoryTest.java
+++ b/client-reactive/src/test/java/com/influxdb/client/reactive/InfluxDBClientReactiveFactoryTest.java
@@ -29,14 +29,11 @@
 import okhttp3.OkHttpClient;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import retrofit2.Retrofit;
 
 /**
  * @author Jakub Bednar (bednar@github) (20/11/2018 07:21)
  */
-@RunWith(JUnitPlatform.class)
 class InfluxDBClientReactiveFactoryTest extends AbstractTest {
 
     @Test
diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/QueryReactiveApiTest.java b/client-reactive/src/test/java/com/influxdb/client/reactive/QueryReactiveApiTest.java
index f92d2ca8c22..c2a908edc49 100644
--- a/client-reactive/src/test/java/com/influxdb/client/reactive/QueryReactiveApiTest.java
+++ b/client-reactive/src/test/java/com/influxdb/client/reactive/QueryReactiveApiTest.java
@@ -36,13 +36,10 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (03/16/2022 08:28)
  */
-@RunWith(JUnitPlatform.class)
 class QueryReactiveApiTest extends AbstractMockServerTest {
 
     private InfluxDBClientReactive influxDBClient;
diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteOptionsReactiveTest.java b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteOptionsReactiveTest.java
index 6975e734dcb..72b3cbd40e7 100644
--- a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteOptionsReactiveTest.java
+++ b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteOptionsReactiveTest.java
@@ -24,13 +24,10 @@
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (05/08/2021 9:23)
  */
-@RunWith(JUnitPlatform.class)
 class WriteOptionsReactiveTest {
     @Test
     void configure() {
diff --git a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java
index bc5bab1d7df..c0dec32cd21 100644
--- a/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java
+++ b/client-reactive/src/test/java/com/influxdb/client/reactive/WriteReactiveApiTest.java
@@ -45,14 +45,11 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.reactivestreams.Publisher;
 
 /**
  * @author Jakub Bednar (02/08/2021 12:28)
  */
-@RunWith(JUnitPlatform.class)
 class WriteReactiveApiTest extends AbstractMockServerTest {
 
     private TestScheduler testScheduler;
diff --git a/client-test/pom.xml b/client-test/pom.xml
index 0a69d6e4712..2918c6586da 100644
--- a/client-test/pom.xml
+++ b/client-test/pom.xml
@@ -106,10 +106,6 @@
             com.squareup.okhttp3
             mockwebserver
             
-                
-                    junit
-                    junit
-                
                 
                     com.squareup.okhttp3
                     okhttp
@@ -137,11 +133,6 @@
             junit-jupiter-engine
         
 
-        
-            org.junit.platform
-            junit-platform-runner
-        
-
         
             org.assertj
             assertj-core
diff --git a/client-utils/pom.xml b/client-utils/pom.xml
index 2b674723948..d1df0ac0508 100644
--- a/client-utils/pom.xml
+++ b/client-utils/pom.xml
@@ -96,12 +96,6 @@
             test
         
 
-        
-            org.junit.platform
-            junit-platform-runner
-            test
-        
-
         
             org.assertj
             assertj-core
diff --git a/client-utils/src/test/java/com/influxdb/utils/ArgumentsDurationTest.java b/client-utils/src/test/java/com/influxdb/utils/ArgumentsDurationTest.java
index 2095a55db7e..9f9adc6f1b1 100644
--- a/client-utils/src/test/java/com/influxdb/utils/ArgumentsDurationTest.java
+++ b/client-utils/src/test/java/com/influxdb/utils/ArgumentsDurationTest.java
@@ -23,14 +23,11 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (20/08/2018 12:31)
  */
 @SuppressWarnings("ConstantConditions")
-@RunWith(JUnitPlatform.class)
 class ArgumentsDurationTest {
 
     @Test
diff --git a/client-utils/src/test/java/com/influxdb/utils/ArgumentsTest.java b/client-utils/src/test/java/com/influxdb/utils/ArgumentsTest.java
index ee789b86c61..4e001470ca9 100644
--- a/client-utils/src/test/java/com/influxdb/utils/ArgumentsTest.java
+++ b/client-utils/src/test/java/com/influxdb/utils/ArgumentsTest.java
@@ -25,14 +25,11 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (01/08/2018 15:29)
  */
 @SuppressWarnings("ConstantConditions")
-@RunWith(JUnitPlatform.class)
 class ArgumentsTest {
 
     @Test
diff --git a/client/src/test/java/com/influxdb/client/FindOptionsTest.java b/client/src/test/java/com/influxdb/client/FindOptionsTest.java
index 919652f4cda..694a2c23edc 100644
--- a/client/src/test/java/com/influxdb/client/FindOptionsTest.java
+++ b/client/src/test/java/com/influxdb/client/FindOptionsTest.java
@@ -23,13 +23,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (18/03/2019 11:53)
  */
-@RunWith(JUnitPlatform.class)
 class FindOptionsTest {
 
     @Test
diff --git a/client/src/test/java/com/influxdb/client/GeneratedCodeTest.java b/client/src/test/java/com/influxdb/client/GeneratedCodeTest.java
index 04fd513ea9f..34de5771a45 100644
--- a/client/src/test/java/com/influxdb/client/GeneratedCodeTest.java
+++ b/client/src/test/java/com/influxdb/client/GeneratedCodeTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (26/08/2021 6:24)
  */
-@RunWith(JUnitPlatform.class)
 class GeneratedCodeTest {
     @Test
     void adapterCanBeInstantiateWithoutParameters() {
diff --git a/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java b/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java
index 681332e0070..fbfaed8bd4a 100644
--- a/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITAuthorizationsApi.java
@@ -39,13 +39,10 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (17/09/2018 12:02)
  */
-@RunWith(JUnitPlatform.class)
 class ITAuthorizationsApi extends AbstractITClientTest {
 
     private static final Logger LOG = Logger.getLogger(ITAuthorizationsApi.class.getName());
diff --git a/client/src/test/java/com/influxdb/client/ITBackpressure.java b/client/src/test/java/com/influxdb/client/ITBackpressure.java
index 04a1c7b13bc..e3159c83047 100644
--- a/client/src/test/java/com/influxdb/client/ITBackpressure.java
+++ b/client/src/test/java/com/influxdb/client/ITBackpressure.java
@@ -53,13 +53,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (24/01/2020 09:40)
  */
-@RunWith(JUnitPlatform.class)
 @EnabledIfSystemProperty(named = "clientBackpressure", matches = "true")
 class ITBackpressure extends AbstractITWrite {
 
diff --git a/client/src/test/java/com/influxdb/client/ITBenchmarkTest.java b/client/src/test/java/com/influxdb/client/ITBenchmarkTest.java
index 8b15a40805e..e4f169c7b58 100644
--- a/client/src/test/java/com/influxdb/client/ITBenchmarkTest.java
+++ b/client/src/test/java/com/influxdb/client/ITBenchmarkTest.java
@@ -28,18 +28,16 @@
 import com.influxdb.client.benchmark.BenchmarkOptions;
 import com.influxdb.client.benchmark.ClientBenchmark;
 import com.influxdb.client.domain.Bucket;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * Client benchmark test
  */
-@RunWith(JUnitPlatform.class)
 class ITBenchmarkTest extends AbstractITClientTest {
 
     private BucketsApi bucketsApi;
diff --git a/client/src/test/java/com/influxdb/client/ITBucketsApi.java b/client/src/test/java/com/influxdb/client/ITBucketsApi.java
index 7d90fa1421d..01421ba52ed 100644
--- a/client/src/test/java/com/influxdb/client/ITBucketsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITBucketsApi.java
@@ -42,13 +42,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (13/09/2018 10:49)
  */
-@RunWith(JUnitPlatform.class)
 class ITBucketsApi extends AbstractITClientTest {
 
     private Organization organization;
diff --git a/client/src/test/java/com/influxdb/client/ITChecksApi.java b/client/src/test/java/com/influxdb/client/ITChecksApi.java
index c1354de77aa..9251ecd814f 100644
--- a/client/src/test/java/com/influxdb/client/ITChecksApi.java
+++ b/client/src/test/java/com/influxdb/client/ITChecksApi.java
@@ -48,13 +48,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (18/09/2019 08:30)
  */
-@RunWith(JUnitPlatform.class)
 class ITChecksApi extends AbstractITClientTest {
 
     private ChecksApi checksApi;
diff --git a/client/src/test/java/com/influxdb/client/ITDashboardsApi.java b/client/src/test/java/com/influxdb/client/ITDashboardsApi.java
index de7abd8f558..8545f487275 100644
--- a/client/src/test/java/com/influxdb/client/ITDashboardsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITDashboardsApi.java
@@ -45,13 +45,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (01/04/2019 10:58)
  */
-@RunWith(JUnitPlatform.class)
 class ITDashboardsApi extends AbstractITClientTest {
 
     private DashboardsApi dashboardsApi;
diff --git a/client/src/test/java/com/influxdb/client/ITDeleteApi.java b/client/src/test/java/com/influxdb/client/ITDeleteApi.java
index 56c47580ac0..8d940a955b1 100644
--- a/client/src/test/java/com/influxdb/client/ITDeleteApi.java
+++ b/client/src/test/java/com/influxdb/client/ITDeleteApi.java
@@ -39,13 +39,10 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Pavlina Rolincova (rolincova@github) (30/10/2019).
  */
-@RunWith(JUnitPlatform.class)
 class ITDeleteApi extends AbstractITClientTest {
 
     private DeleteApi deleteApi;
diff --git a/client/src/test/java/com/influxdb/client/ITInfluxDBClient.java b/client/src/test/java/com/influxdb/client/ITInfluxDBClient.java
index 18133689022..96e35b94d55 100644
--- a/client/src/test/java/com/influxdb/client/ITInfluxDBClient.java
+++ b/client/src/test/java/com/influxdb/client/ITInfluxDBClient.java
@@ -26,7 +26,6 @@
 import java.time.ZoneOffset;
 import java.util.List;
 
-import com.influxdb.LogLevel;
 import com.influxdb.client.domain.HealthCheck;
 import com.influxdb.client.domain.OnboardingRequest;
 import com.influxdb.client.domain.OnboardingResponse;
@@ -41,13 +40,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (20/11/2018 07:37)
  */
-@RunWith(JUnitPlatform.class)
 class ITInfluxDBClient extends AbstractITClientTest {
 
     @Test
diff --git a/client/src/test/java/com/influxdb/client/ITInfluxQLQueryApi.java b/client/src/test/java/com/influxdb/client/ITInfluxQLQueryApi.java
index 38f341a8e10..39d77274b08 100644
--- a/client/src/test/java/com/influxdb/client/ITInfluxQLQueryApi.java
+++ b/client/src/test/java/com/influxdb/client/ITInfluxQLQueryApi.java
@@ -37,14 +37,11 @@
 import org.assertj.core.api.ListAssert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 import static org.assertj.core.api.InstanceOfAssertFactories.BIG_DECIMAL;
 import static org.assertj.core.api.InstanceOfAssertFactories.INSTANT;
 import static org.assertj.core.api.InstanceOfAssertFactories.list;
 
-@RunWith(JUnitPlatform.class)
 class ITInfluxQLQueryApi extends AbstractITClientTest {
 
 	private static final String DATABASE_NAME = "my-database";
diff --git a/client/src/test/java/com/influxdb/client/ITLabelsApi.java b/client/src/test/java/com/influxdb/client/ITLabelsApi.java
index 16cb6ca7ea0..4e2f6516e2a 100644
--- a/client/src/test/java/com/influxdb/client/ITLabelsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITLabelsApi.java
@@ -33,13 +33,10 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (28/01/2019 10:52)
  */
-@RunWith(JUnitPlatform.class)
 class ITLabelsApi extends AbstractITClientTest {
 
     private LabelsApi labelsApi;
diff --git a/client/src/test/java/com/influxdb/client/ITMonitoringAlerting.java b/client/src/test/java/com/influxdb/client/ITMonitoringAlerting.java
index b73b7988659..60c4aa6f61d 100644
--- a/client/src/test/java/com/influxdb/client/ITMonitoringAlerting.java
+++ b/client/src/test/java/com/influxdb/client/ITMonitoringAlerting.java
@@ -45,13 +45,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (25/09/2019 09:41)
  */
-@RunWith(JUnitPlatform.class)
 class ITMonitoringAlerting extends AbstractITClientTest {
 
     private MockServerExtension mockServerExtension;
diff --git a/client/src/test/java/com/influxdb/client/ITNotificationEndpointsApi.java b/client/src/test/java/com/influxdb/client/ITNotificationEndpointsApi.java
index 79fe2475082..4bb7ff06dff 100644
--- a/client/src/test/java/com/influxdb/client/ITNotificationEndpointsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITNotificationEndpointsApi.java
@@ -44,13 +44,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (10/09/2019 08:50)
  */
-@RunWith(JUnitPlatform.class)
 class ITNotificationEndpointsApi extends AbstractITClientTest {
 
     private NotificationEndpointsApi notificationEndpointsApi;
diff --git a/client/src/test/java/com/influxdb/client/ITNotificationRulesApi.java b/client/src/test/java/com/influxdb/client/ITNotificationRulesApi.java
index ed50b969b9e..a6780b3afeb 100644
--- a/client/src/test/java/com/influxdb/client/ITNotificationRulesApi.java
+++ b/client/src/test/java/com/influxdb/client/ITNotificationRulesApi.java
@@ -54,13 +54,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (24/09/2019 09:34)
  */
-@RunWith(JUnitPlatform.class)
 class ITNotificationRulesApi extends AbstractITClientTest {
 
     private NotificationRulesApi notificationRulesApi;
diff --git a/client/src/test/java/com/influxdb/client/ITOrganizationsApi.java b/client/src/test/java/com/influxdb/client/ITOrganizationsApi.java
index 6d4b97b17bb..5a8a4637c98 100644
--- a/client/src/test/java/com/influxdb/client/ITOrganizationsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITOrganizationsApi.java
@@ -41,13 +41,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (12/09/2018 09:51)
  */
-@RunWith(JUnitPlatform.class)
 class ITOrganizationsApi extends AbstractITClientTest {
 
     private static final Logger LOG = Logger.getLogger(ITOrganizationsApi.class.getName());
diff --git a/client/src/test/java/com/influxdb/client/ITQueryService.java b/client/src/test/java/com/influxdb/client/ITQueryService.java
index 2a8027b39d0..1c7d50c28e7 100644
--- a/client/src/test/java/com/influxdb/client/ITQueryService.java
+++ b/client/src/test/java/com/influxdb/client/ITQueryService.java
@@ -43,13 +43,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (08/04/2019 09:41)
  */
-@RunWith(JUnitPlatform.class)
 class ITQueryService extends AbstractITClientTest {
 
     private QueryService queryService;
diff --git a/client/src/test/java/com/influxdb/client/ITScraperTargetsApi.java b/client/src/test/java/com/influxdb/client/ITScraperTargetsApi.java
index 35f6a4de10a..605d1d33d9f 100644
--- a/client/src/test/java/com/influxdb/client/ITScraperTargetsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITScraperTargetsApi.java
@@ -38,13 +38,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (22/01/2019 08:23)
  */
-@RunWith(JUnitPlatform.class)
 class ITScraperTargetsApi extends AbstractITClientTest {
 
     private ScraperTargetsApi scraperTargetsApi;
diff --git a/client/src/test/java/com/influxdb/client/ITSourcesApi.java b/client/src/test/java/com/influxdb/client/ITSourcesApi.java
index 14acd8f404f..f6f00f89b6a 100644
--- a/client/src/test/java/com/influxdb/client/ITSourcesApi.java
+++ b/client/src/test/java/com/influxdb/client/ITSourcesApi.java
@@ -36,13 +36,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (18/09/2018 09:42)
  */
-@RunWith(JUnitPlatform.class)
 class ITSourcesApi extends AbstractITClientTest {
 
     private static final Logger LOG = Logger.getLogger(ITSourcesApi.class.getName());
diff --git a/client/src/test/java/com/influxdb/client/ITTasksApi.java b/client/src/test/java/com/influxdb/client/ITTasksApi.java
index 487a592f167..15d703610a4 100644
--- a/client/src/test/java/com/influxdb/client/ITTasksApi.java
+++ b/client/src/test/java/com/influxdb/client/ITTasksApi.java
@@ -52,13 +52,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (05/09/2018 15:54)
  */
-@RunWith(JUnitPlatform.class)
 class ITTasksApi extends AbstractITClientTest {
 
     private static final Logger LOG = Logger.getLogger(ITTasksApi.class.getName());
diff --git a/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java b/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java
index 87d868f48e0..d70a11e35b6 100644
--- a/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java
+++ b/client/src/test/java/com/influxdb/client/ITTelegrafsApi.java
@@ -43,13 +43,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (28/02/2019 10:31)
  */
-@RunWith(JUnitPlatform.class)
 class ITTelegrafsApi extends AbstractITClientTest {
 
     private TelegrafsApi telegrafsApi;
diff --git a/client/src/test/java/com/influxdb/client/ITUsersApi.java b/client/src/test/java/com/influxdb/client/ITUsersApi.java
index 50ecf32fb83..1456cd2ae69 100644
--- a/client/src/test/java/com/influxdb/client/ITUsersApi.java
+++ b/client/src/test/java/com/influxdb/client/ITUsersApi.java
@@ -34,13 +34,10 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (11/09/2018 11:26)
  */
-@RunWith(JUnitPlatform.class)
 class ITUsersApi extends AbstractITClientTest {
 
     private static final Logger LOG = Logger.getLogger(ITUsersApi.class.getName());
diff --git a/client/src/test/java/com/influxdb/client/ITVariablesApi.java b/client/src/test/java/com/influxdb/client/ITVariablesApi.java
index 541debb582d..0fce637383d 100644
--- a/client/src/test/java/com/influxdb/client/ITVariablesApi.java
+++ b/client/src/test/java/com/influxdb/client/ITVariablesApi.java
@@ -40,13 +40,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (27/03/2019 09:46)
  */
-@RunWith(JUnitPlatform.class)
 class ITVariablesApi extends AbstractITClientTest {
 
     private VariablesApi variablesApi;
diff --git a/client/src/test/java/com/influxdb/client/ITWriteApiBlocking.java b/client/src/test/java/com/influxdb/client/ITWriteApiBlocking.java
index 149141b30dc..d9910f221eb 100644
--- a/client/src/test/java/com/influxdb/client/ITWriteApiBlocking.java
+++ b/client/src/test/java/com/influxdb/client/ITWriteApiBlocking.java
@@ -34,13 +34,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (16/07/2019 07:13)
  */
-@RunWith(JUnitPlatform.class)
 class ITWriteApiBlocking extends AbstractITWrite {
 
     @Test
diff --git a/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java b/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java
index c05d04680e6..51835c7cccf 100644
--- a/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java
+++ b/client/src/test/java/com/influxdb/client/ITWriteQueryApi.java
@@ -49,13 +49,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/09/2018 13:39)
  */
-@RunWith(JUnitPlatform.class)
 class ITWriteQueryApi extends AbstractITClientTest {
 
     private static final Logger LOG = Logger.getLogger(ITWriteQueryApi.class.getName());
diff --git a/client/src/test/java/com/influxdb/client/InfluxDBClientFactoryTest.java b/client/src/test/java/com/influxdb/client/InfluxDBClientFactoryTest.java
index f801a8bca88..93837557ffb 100644
--- a/client/src/test/java/com/influxdb/client/InfluxDBClientFactoryTest.java
+++ b/client/src/test/java/com/influxdb/client/InfluxDBClientFactoryTest.java
@@ -32,14 +32,11 @@
 import okhttp3.OkHttpClient;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import retrofit2.Retrofit;
 
 /**
  * @author Jakub Bednar (bednar@github) (05/09/2018 10:59)
  */
-@RunWith(JUnitPlatform.class)
 class InfluxDBClientFactoryTest extends AbstractTest {
 
     @Test
diff --git a/client/src/test/java/com/influxdb/client/InfluxDBClientOptionsTest.java b/client/src/test/java/com/influxdb/client/InfluxDBClientOptionsTest.java
index 1b7f05befaa..5c18f75c3ee 100644
--- a/client/src/test/java/com/influxdb/client/InfluxDBClientOptionsTest.java
+++ b/client/src/test/java/com/influxdb/client/InfluxDBClientOptionsTest.java
@@ -30,13 +30,10 @@
 import okhttp3.Protocol;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (05/09/2018 10:38)
  */
-@RunWith(JUnitPlatform.class)
 class InfluxDBClientOptionsTest {
 
     @Test
diff --git a/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java b/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java
index dd1c7fea6be..ee163c12c9a 100644
--- a/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java
+++ b/client/src/test/java/com/influxdb/client/InfluxDBClientTest.java
@@ -49,13 +49,10 @@
 import okhttp3.mockwebserver.RecordedRequest;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (05/09/2018 14:00)
  */
-@RunWith(JUnitPlatform.class)
 class InfluxDBClientTest extends AbstractInfluxDBClientTest {
 
     @Test
diff --git a/client/src/test/java/com/influxdb/client/InvokableScriptsApiTest.java b/client/src/test/java/com/influxdb/client/InvokableScriptsApiTest.java
index 656b48d9b6f..306aaefbd6a 100644
--- a/client/src/test/java/com/influxdb/client/InvokableScriptsApiTest.java
+++ b/client/src/test/java/com/influxdb/client/InvokableScriptsApiTest.java
@@ -34,10 +34,7 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 class InvokableScriptsApiTest extends AbstractInfluxDBClientTest {
 
     static final String SUCCESS_DATA = ",result,table,_start,_stop,_time,_value,_field,_measurement,host,value\n"
diff --git a/client/src/test/java/com/influxdb/client/QueryApiTest.java b/client/src/test/java/com/influxdb/client/QueryApiTest.java
index 446dfb58910..a6e6e04e6b9 100644
--- a/client/src/test/java/com/influxdb/client/QueryApiTest.java
+++ b/client/src/test/java/com/influxdb/client/QueryApiTest.java
@@ -26,22 +26,20 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.google.gson.Gson;
 import com.influxdb.client.domain.Dialect;
 import com.influxdb.client.domain.Query;
-import static com.influxdb.client.internal.AbstractInfluxDBClient.DEFAULT_DIALECT;
 import com.influxdb.client.internal.AbstractInfluxDBClientTest;
 
+import com.google.gson.Gson;
 import okhttp3.mockwebserver.RecordedRequest;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
+
+import static com.influxdb.client.internal.AbstractInfluxDBClient.DEFAULT_DIALECT;
 
 /**
  * @author Jakub Bednar (bednar@github) (07/05/2019 09:17)
  */
-@RunWith(JUnitPlatform.class)
 class QueryApiTest extends AbstractInfluxDBClientTest {
 
     @Test
diff --git a/client/src/test/java/com/influxdb/client/WriteApiBlockingTest.java b/client/src/test/java/com/influxdb/client/WriteApiBlockingTest.java
index af60b115c3b..dc8ed2b20fc 100644
--- a/client/src/test/java/com/influxdb/client/WriteApiBlockingTest.java
+++ b/client/src/test/java/com/influxdb/client/WriteApiBlockingTest.java
@@ -33,13 +33,10 @@
 import okhttp3.mockwebserver.RecordedRequest;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (12/11/2020 10:25)
  */
-@RunWith(JUnitPlatform.class)
 class WriteApiBlockingTest extends AbstractInfluxDBClientTest {
 
     @Test
diff --git a/client/src/test/java/com/influxdb/client/WriteApiTest.java b/client/src/test/java/com/influxdb/client/WriteApiTest.java
index 9c3456e2c1a..59cf9ad3819 100644
--- a/client/src/test/java/com/influxdb/client/WriteApiTest.java
+++ b/client/src/test/java/com/influxdb/client/WriteApiTest.java
@@ -54,13 +54,10 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (21/09/2018 11:36)
  */
-@RunWith(JUnitPlatform.class)
 class WriteApiTest extends AbstractInfluxDBClientTest {
 
     private WriteApi writeApi;
diff --git a/client/src/test/java/com/influxdb/client/WriteOptionsTest.java b/client/src/test/java/com/influxdb/client/WriteOptionsTest.java
index 90a60e2b5db..5afe2c8735e 100644
--- a/client/src/test/java/com/influxdb/client/WriteOptionsTest.java
+++ b/client/src/test/java/com/influxdb/client/WriteOptionsTest.java
@@ -25,13 +25,10 @@
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (21/09/2018 10:35)
  */
-@RunWith(JUnitPlatform.class)
 class WriteOptionsTest {
 
     @Test
diff --git a/client/src/test/java/com/influxdb/client/internal/AuthenticateInterceptorTest.java b/client/src/test/java/com/influxdb/client/internal/AuthenticateInterceptorTest.java
index d4a128c42b1..eef94b7aa48 100644
--- a/client/src/test/java/com/influxdb/client/internal/AuthenticateInterceptorTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/AuthenticateInterceptorTest.java
@@ -37,13 +37,10 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (12/10/2018 12:50)
  */
-@RunWith(JUnitPlatform.class)
 class AuthenticateInterceptorTest extends AbstractMockServerTest {
 
     private String influxDB_URL;
diff --git a/client/src/test/java/com/influxdb/client/internal/GzipInterceptorTest.java b/client/src/test/java/com/influxdb/client/internal/GzipInterceptorTest.java
index 4ac8660486a..7630b83abcd 100644
--- a/client/src/test/java/com/influxdb/client/internal/GzipInterceptorTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/GzipInterceptorTest.java
@@ -36,13 +36,10 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (15/10/2018 11:27)
  */
-@RunWith(JUnitPlatform.class)
 class GzipInterceptorTest extends AbstractMockServerTest {
 
     private String url;
diff --git a/client/src/test/java/com/influxdb/client/internal/MeasurementMapperTest.java b/client/src/test/java/com/influxdb/client/internal/MeasurementMapperTest.java
index da7c30433d4..c26b77031b3 100644
--- a/client/src/test/java/com/influxdb/client/internal/MeasurementMapperTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/MeasurementMapperTest.java
@@ -31,13 +31,10 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (15/10/2018 13:36)
  */
-@RunWith(JUnitPlatform.class)
 class MeasurementMapperTest {
 
     private MeasurementMapper mapper;
diff --git a/client/src/test/java/com/influxdb/client/internal/RetryAttemptTest.java b/client/src/test/java/com/influxdb/client/internal/RetryAttemptTest.java
index 6b6fda5ecb7..f0957388996 100644
--- a/client/src/test/java/com/influxdb/client/internal/RetryAttemptTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/RetryAttemptTest.java
@@ -39,15 +39,12 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import retrofit2.HttpException;
 import retrofit2.Response;
 
 /**
  * @author Jakub Bednar (29/09/2020 11:21)
  */
-@RunWith(JUnitPlatform.class)
 class RetryAttemptTest {
     
     private final WriteOptions DEFAULT = WriteOptions.builder().build();
diff --git a/client/src/test/java/com/influxdb/client/internal/WaitToConditionTest.java b/client/src/test/java/com/influxdb/client/internal/WaitToConditionTest.java
index f8f3871e980..b135d46ce56 100644
--- a/client/src/test/java/com/influxdb/client/internal/WaitToConditionTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/WaitToConditionTest.java
@@ -31,13 +31,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (28/01/2020 14:47)
  */
-@RunWith(JUnitPlatform.class)
 class WaitToConditionTest {
     
     @Test
diff --git a/client/src/test/java/com/influxdb/client/internal/flowable/BackpressureBatchesBufferStrategyTest.java b/client/src/test/java/com/influxdb/client/internal/flowable/BackpressureBatchesBufferStrategyTest.java
index 2baa20984d6..5cf5613c315 100644
--- a/client/src/test/java/com/influxdb/client/internal/flowable/BackpressureBatchesBufferStrategyTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/flowable/BackpressureBatchesBufferStrategyTest.java
@@ -13,15 +13,12 @@
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 import static io.reactivex.rxjava3.core.BackpressureOverflowStrategy.DROP_OLDEST;
 
 /**
  * @author Jakub Bednar (bednar@github) (29/06/2022 07:54)
  */
-@RunWith(JUnitPlatform.class)
 class BackpressureBatchesBufferStrategyTest {
 
     @Test
diff --git a/client/src/test/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushableTest.java b/client/src/test/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushableTest.java
index 46eb49f34b3..4d9b248df8a 100644
--- a/client/src/test/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushableTest.java
+++ b/client/src/test/java/com/influxdb/client/internal/flowable/FlowableBufferTimedFlushableTest.java
@@ -13,13 +13,10 @@
 import io.reactivex.rxjava3.schedulers.TestScheduler;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (29/06/2022 07:40)
  */
-@RunWith(JUnitPlatform.class)
 class FlowableBufferTimedFlushableTest {
 
     @Test
diff --git a/client/src/test/java/com/influxdb/client/write/PointSettingsTest.java b/client/src/test/java/com/influxdb/client/write/PointSettingsTest.java
index 3054a851fd7..f8a0aae8216 100644
--- a/client/src/test/java/com/influxdb/client/write/PointSettingsTest.java
+++ b/client/src/test/java/com/influxdb/client/write/PointSettingsTest.java
@@ -26,13 +26,10 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (28/06/2019 09:35)
  */
-@RunWith(JUnitPlatform.class)
 class PointSettingsTest {
 
     private PointSettings defaults;
diff --git a/client/src/test/java/com/influxdb/client/write/PointTest.java b/client/src/test/java/com/influxdb/client/write/PointTest.java
index 2f5c9f68b82..e93827055e5 100644
--- a/client/src/test/java/com/influxdb/client/write/PointTest.java
+++ b/client/src/test/java/com/influxdb/client/write/PointTest.java
@@ -30,13 +30,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (11/10/2018 12:57)
  */
-@RunWith(JUnitPlatform.class)
 class PointTest {
 
     @Test
diff --git a/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java b/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java
index 749e3c2a972..48432edcca1 100644
--- a/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java
+++ b/client/src/test/java/com/influxdb/client/write/WriteParametersTest.java
@@ -28,10 +28,7 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 class WriteParametersTest {
 
     private InfluxDBClientOptions.Builder optionsBuilder;
diff --git a/flux-dsl/src/test/java/com/example/flux/CustomFunction.java b/flux-dsl/src/test/java/com/example/flux/CustomFunction.java
index 32b19d47736..e80c2d065b0 100644
--- a/flux-dsl/src/test/java/com/example/flux/CustomFunction.java
+++ b/flux-dsl/src/test/java/com/example/flux/CustomFunction.java
@@ -29,13 +29,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (02/07/2018 13:55)
  */
-@RunWith(JUnitPlatform.class)
 class CustomFunction {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/AbstractFunctionFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/AbstractFunctionFluxTest.java
index 3ff93c25f7a..e2a2a14de1f 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/AbstractFunctionFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/AbstractFunctionFluxTest.java
@@ -27,12 +27,10 @@
 import com.influxdb.query.dsl.functions.AbstractFunctionCallFlux;
 import com.influxdb.query.dsl.functions.AbstractFunctionFlux;
 import com.influxdb.query.dsl.functions.FreestyleExpression;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 public class AbstractFunctionFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/FluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/FluxTest.java
index 52e36be28a0..d2668ee3fb0 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/FluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/FluxTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (22/06/2018 10:27)
  */
-@RunWith(JUnitPlatform.class)
 class FluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/AggregateWindowTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/AggregateWindowTest.java
index 3f1255d297f..2fd06b8cf91 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/AggregateWindowTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/AggregateWindowTest.java
@@ -24,15 +24,13 @@
 import java.time.temporal.ChronoUnit;
 
 import com.influxdb.query.dsl.Flux;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (13/05/2020 15:07)
  */
-@RunWith(JUnitPlatform.class)
 class AggregateWindowTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ArrayFromFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ArrayFromFluxTest.java
index b1597eff672..86667429e8e 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ArrayFromFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ArrayFromFluxTest.java
@@ -25,12 +25,10 @@
 import java.util.Map;
 
 import com.influxdb.query.dsl.Flux;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 class ArrayFromFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ColumnsFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ColumnsFluxTest.java
index f4839f854de..7c40776ba3b 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ColumnsFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ColumnsFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (19/04/2022 09:49)
  */
-@RunWith(JUnitPlatform.class)
 class ColumnsFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CountFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CountFluxTest.java
index e0d9e9a66f0..fe5ddfda3da 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CountFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CountFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (22/06/2018 12:04)
  */
-@RunWith(JUnitPlatform.class)
 class CountFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CovarianceFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CovarianceFluxTest.java
index d2b6c4340a5..c1cd5097a20 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CovarianceFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CovarianceFluxTest.java
@@ -28,13 +28,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (17/07/2018 13:51)
  */
-@RunWith(JUnitPlatform.class)
 class CovarianceFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CumulativeSumFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CumulativeSumFluxTest.java
index 7959c270704..e280f6af781 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CumulativeSumFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/CumulativeSumFluxTest.java
@@ -28,13 +28,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (10/10/2018 07:45)
  */
-@RunWith(JUnitPlatform.class)
 class CumulativeSumFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DerivativeFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DerivativeFluxTest.java
index 7d7714f6a35..56b169c80a7 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DerivativeFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DerivativeFluxTest.java
@@ -29,13 +29,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (03/07/2018 15:05)
  */
-@RunWith(JUnitPlatform.class)
 class DerivativeFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DifferenceFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DifferenceFluxTest.java
index 6f3a05a8d28..6f0f1a4460d 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DifferenceFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DifferenceFluxTest.java
@@ -29,13 +29,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (17/07/2018 12:57)
  */
-@RunWith(JUnitPlatform.class)
 class DifferenceFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DistinctFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DistinctFluxTest.java
index 38906c79f4e..1eb4863eabe 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DistinctFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DistinctFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (17/07/2018 12:15)
  */
-@RunWith(JUnitPlatform.class)
 class DistinctFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DropFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DropFluxTest.java
index c93f5c257c3..ddbd7564020 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DropFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DropFluxTest.java
@@ -28,13 +28,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (02/08/2018 11:09)
  */
-@RunWith(JUnitPlatform.class)
 class DropFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DuplicateFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DuplicateFluxTest.java
index 7fa9ddac276..9c9ded62ebe 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DuplicateFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/DuplicateFluxTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (09/10/2018 13:27)
  */
-@RunWith(JUnitPlatform.class)
 class DuplicateFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ExpressionFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ExpressionFluxTest.java
index 3f860fb6c0c..91e399f5d22 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ExpressionFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ExpressionFluxTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (27/06/2018 11:30)
  */
-@RunWith(JUnitPlatform.class)
 class ExpressionFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FillFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FillFluxTest.java
index 60d9564fa76..34252c0a34e 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FillFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FillFluxTest.java
@@ -24,15 +24,13 @@
 import java.time.Instant;
 
 import com.influxdb.query.dsl.Flux;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (09/10/2018 13:27)
  */
-@RunWith(JUnitPlatform.class)
 class FillFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FilterFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FilterFluxTest.java
index 20e34d54821..ec37da8ce14 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FilterFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FilterFluxTest.java
@@ -30,13 +30,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (28/06/2018 11:46)
  */
-@RunWith(JUnitPlatform.class)
 class FilterFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FirstFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FirstFluxTest.java
index 33914413f8b..92c4b88d70c 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FirstFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FirstFluxTest.java
@@ -21,19 +21,14 @@
  */
 package com.influxdb.query.dsl.functions;
 
-import java.util.HashMap;
-
 import com.influxdb.query.dsl.Flux;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 09:40)
  */
-@RunWith(JUnitPlatform.class)
 class FirstFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FromFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FromFluxTest.java
index 5714f888383..b2ef3fcb9d4 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FromFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/FromFluxTest.java
@@ -29,13 +29,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (22/06/2018 12:04)
  */
-@RunWith(JUnitPlatform.class)
 class FromFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/GroupFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/GroupFluxTest.java
index 20de5543e0a..2c1e59e27d3 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/GroupFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/GroupFluxTest.java
@@ -29,13 +29,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 15:16)
  */
-@RunWith(JUnitPlatform.class)
 class GroupFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/IntegralFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/IntegralFluxTest.java
index e329d1d4175..beb8c3b6cc0 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/IntegralFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/IntegralFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (03/07/2018 12:48)
  */
-@RunWith(JUnitPlatform.class)
 class IntegralFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/InterpolateLinearTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/InterpolateLinearTest.java
index 4d06d88eab6..99f75067ca3 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/InterpolateLinearTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/InterpolateLinearTest.java
@@ -24,12 +24,10 @@
 import java.time.temporal.ChronoUnit;
 
 import com.influxdb.query.dsl.Flux;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 class InterpolateLinearTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/JoinFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/JoinFluxTest.java
index 37fc144dafa..79f54c84f88 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/JoinFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/JoinFluxTest.java
@@ -31,13 +31,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (19/07/2018 12:59)
  */
-@RunWith(JUnitPlatform.class)
 class JoinFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/KeepFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/KeepFluxTest.java
index 39c456e49e5..23306daa548 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/KeepFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/KeepFluxTest.java
@@ -28,13 +28,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (02/08/2018 11:43)
  */
-@RunWith(JUnitPlatform.class)
 class KeepFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LastFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LastFluxTest.java
index bf0862be2ce..f0acb686c82 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LastFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LastFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 09:47)
  */
-@RunWith(JUnitPlatform.class)
 class LastFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LimitFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LimitFluxTest.java
index e4aaf094709..89a5b3af4ac 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LimitFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/LimitFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 11:55)
  */
-@RunWith(JUnitPlatform.class)
 class LimitFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MapFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MapFluxTest.java
index 819121bdfa1..37872b8b67a 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MapFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MapFluxTest.java
@@ -30,13 +30,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (17/07/2018 07:58)
  */
-@RunWith(JUnitPlatform.class)
 class MapFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MaxFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MaxFluxTest.java
index 5be1e192d54..9c6539382d2 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MaxFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MaxFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 09:52)
  */
-@RunWith(JUnitPlatform.class)
 class MaxFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MeanFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MeanFluxTest.java
index 64d7bc65612..224d1df3842 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MeanFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MeanFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 09:58)
  */
-@RunWith(JUnitPlatform.class)
 class MeanFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MinFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MinFluxTest.java
index 4bd74e29eb1..e23405d7332 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MinFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/MinFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 10:03)
  */
-@RunWith(JUnitPlatform.class)
 class MinFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/PivotFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/PivotFluxTest.java
index 12961805140..ae7749d25c3 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/PivotFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/PivotFluxTest.java
@@ -28,13 +28,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (10/10/2018 06:59)
  */
-@RunWith(JUnitPlatform.class)
 class PivotFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/QuantileFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/QuantileFluxTest.java
index 3866e7bb5a5..6677d1c5693 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/QuantileFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/QuantileFluxTest.java
@@ -21,19 +21,14 @@
  */
 package com.influxdb.query.dsl.functions;
 
-import java.util.Arrays;
-
 import com.influxdb.query.dsl.Flux;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (10/10/2018 12:38)
  */
-@RunWith(JUnitPlatform.class)
 class QuantileFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RangeFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RangeFluxTest.java
index d55ec958b40..f3a19431305 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RangeFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RangeFluxTest.java
@@ -29,13 +29,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (26/06/2018 07:23)
  */
-@RunWith(JUnitPlatform.class)
 class RangeFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ReduceFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ReduceFluxTest.java
index 373291072ae..5dc3458c7e5 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ReduceFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ReduceFluxTest.java
@@ -28,13 +28,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (24/02/2020 13:26)
  */
-@RunWith(JUnitPlatform.class)
 class ReduceFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RenameFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RenameFluxTest.java
index 45744c9f236..06eacf29980 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RenameFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/RenameFluxTest.java
@@ -28,13 +28,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (02/08/2018 12:01)
  */
-@RunWith(JUnitPlatform.class)
 class RenameFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SampleFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SampleFluxTest.java
index 3f759616c11..a69e35e0226 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SampleFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SampleFluxTest.java
@@ -28,13 +28,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (29/06/2018 07:37)
  */
-@RunWith(JUnitPlatform.class)
 class SampleFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SetFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SetFluxTest.java
index 04175b7fc0d..6d866ec312a 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SetFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SetFluxTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (29/06/2018 09:32)
  */
-@RunWith(JUnitPlatform.class)
 class SetFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SkewFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SkewFluxTest.java
index fc251ee789b..cd534a47363 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SkewFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SkewFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 10:08)
  */
-@RunWith(JUnitPlatform.class)
 class SkewFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SortFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SortFluxTest.java
index 82a8b004732..e1ad00ad03b 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SortFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SortFluxTest.java
@@ -29,13 +29,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 13:54)
  */
-@RunWith(JUnitPlatform.class)
 class SortFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SpreadFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SpreadFluxTest.java
index 62febe4140e..450aa738102 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SpreadFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SpreadFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 10:13)
  */
-@RunWith(JUnitPlatform.class)
 class SpreadFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/StddevFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/StddevFluxTest.java
index c30c3d7e9b2..13d9e8704e5 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/StddevFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/StddevFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 10:18)
  */
-@RunWith(JUnitPlatform.class)
 class StddevFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SumFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SumFluxTest.java
index 347acc1ac15..a76203b8ba4 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SumFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/SumFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 10:22)
  */
-@RunWith(JUnitPlatform.class)
 class SumFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TailFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TailFluxTest.java
index a2627c2fdc0..abcf2f0d344 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TailFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TailFluxTest.java
@@ -27,13 +27,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (14/12/2020 10:24)
  */
-@RunWith(JUnitPlatform.class)
 class TailFluxTest
 {
 	@Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TimeShiftFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TimeShiftFluxTest.java
index db26fc574da..19d89c61a45 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TimeShiftFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TimeShiftFluxTest.java
@@ -29,13 +29,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (29/06/2018 10:46)
  */
-@RunWith(JUnitPlatform.class)
 class TimeShiftFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToBoolFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToBoolFluxTest.java
index 432894fde1b..8a62544f66b 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToBoolFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToBoolFluxTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 16:01)
  */
-@RunWith(JUnitPlatform.class)
 class ToBoolFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToDurationFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToDurationFluxTest.java
index 6d9903974fa..a50e628339c 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToDurationFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToDurationFluxTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (26/06/2018 06:30)
  */
-@RunWith(JUnitPlatform.class)
 class ToDurationFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFloatFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFloatFluxTest.java
index 473b8267e56..c45fb08f82b 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFloatFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFloatFluxTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 16:09)
  */
-@RunWith(JUnitPlatform.class)
 class ToFloatFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFluxTest.java
index 2bc8c74c415..31a47c9b36f 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToFluxTest.java
@@ -28,13 +28,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (10/10/2018 09:35)
  */
-@RunWith(JUnitPlatform.class)
 class ToFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToIntFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToIntFluxTest.java
index ce9917184d9..cf5d6a12343 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToIntFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToIntFluxTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (25/06/2018 16:09)
  */
-@RunWith(JUnitPlatform.class)
 class ToIntFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToStringFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToStringFluxTest.java
index 09890ac9bd0..f94d6870272 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToStringFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToStringFluxTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (26/06/2018 06:35)
  */
-@RunWith(JUnitPlatform.class)
 class ToStringFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToTimeFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToTimeFluxTest.java
index 8afe019e7ba..22f3cedaf4e 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToTimeFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToTimeFluxTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (26/06/2018 06:39)
  */
-@RunWith(JUnitPlatform.class)
 class ToTimeFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToUIntFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToUIntFluxTest.java
index 7b7ba7fb914..2a7bfe6f9de 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToUIntFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/ToUIntFluxTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (26/06/2018 06:43)
  */
-@RunWith(JUnitPlatform.class)
 class ToUIntFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TruncateTimeColumnTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TruncateTimeColumnTest.java
index 1c60b7de7b6..b18f114deb2 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TruncateTimeColumnTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/TruncateTimeColumnTest.java
@@ -24,13 +24,11 @@
 import java.time.temporal.ChronoUnit;
 
 import com.influxdb.query.dsl.Flux;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 
-@RunWith(JUnitPlatform.class)
 class TruncateTimeColumnTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/UnionFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/UnionFluxTest.java
index ea2824ee53f..3622e0607dc 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/UnionFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/UnionFluxTest.java
@@ -23,15 +23,13 @@
 
 import com.influxdb.query.dsl.Expressions;
 import com.influxdb.query.dsl.Flux;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (29/06/2018 10:03)
  */
-@RunWith(JUnitPlatform.class)
 class UnionFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/WindowFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/WindowFluxTest.java
index 01f0ef72238..9c198d66b9f 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/WindowFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/WindowFluxTest.java
@@ -30,13 +30,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (27/06/2018 12:42)
  */
-@RunWith(JUnitPlatform.class)
 class WindowFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/YieldFluxTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/YieldFluxTest.java
index 50568da1dd2..ae889eae567 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/YieldFluxTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/YieldFluxTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (29/06/2018 10:03)
  */
-@RunWith(JUnitPlatform.class)
 class YieldFluxTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/properties/TimeIntervalTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/properties/TimeIntervalTest.java
index 4a31ce13b58..16b847591d3 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/properties/TimeIntervalTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/properties/TimeIntervalTest.java
@@ -25,13 +25,10 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 /**
  * @author Jakub Bednar (bednar@github) (09/10/2018 12:24)
  */
-@RunWith(JUnitPlatform.class)
 class TimeIntervalTest {
 
     @Test
diff --git a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java
index e0151c5b433..7a700535602 100644
--- a/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java
+++ b/flux-dsl/src/test/java/com/influxdb/query/dsl/functions/restriction/RestrictionsTest.java
@@ -21,19 +21,17 @@
  */
 package com.influxdb.query.dsl.functions.restriction;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.influxdb.query.dsl.Flux;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
-
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @author Jakub Bednar (bednar@github) (09/10/2018 10:33)
  */
-@RunWith(JUnitPlatform.class)
 class RestrictionsTest {
 
     @Test
diff --git a/pom.xml b/pom.xml
index d0e677c62fd..5238bfb2586 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,6 +254,13 @@
                 org.apache.maven.plugins
                 maven-surefire-plugin
                 ${plugin.surefire.version}
+                
+                    
+                        org.junit.vintage
+                        junit-vintage-engine
+                        ${junit-jupiter.version}
+                    
+                
             
 
             
@@ -268,6 +275,13 @@
                         
                     
                 
+                
+                    
+                        org.junit.vintage
+                        junit-vintage-engine
+                        ${junit-jupiter.version}
+                    
+                
             
 
             
@@ -623,12 +637,6 @@
                 ${junit-jupiter.version}
             
 
-            
-                org.junit.platform
-                junit-platform-runner
-                1.9.0
-            
-
             
                 org.hamcrest
                 hamcrest
diff --git a/spring/pom.xml b/spring/pom.xml
index d1dfe6a8091..3ce4e70cee2 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -153,12 +153,6 @@
             test
         
 
-        
-            org.junit.platform
-            junit-platform-runner
-            test
-        
-
         
             org.assertj
             assertj-core
diff --git a/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java b/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java
index 1fc74551d69..d57fe38e515 100644
--- a/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java
+++ b/spring/src/test/java/com/influxdb/spring/health/InfluxDB2HealthIndicatorAutoConfigurationTest.java
@@ -24,8 +24,6 @@
 import com.influxdb.client.InfluxDBClient;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -40,7 +38,6 @@
  *
  * @author Jakub Bednar (bednar@github) (07/05/2019 14:59)
  */
-@RunWith(JUnitPlatform.class)
 class InfluxDB2HealthIndicatorAutoConfigurationTest {
 
     private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
diff --git a/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationReactiveTest.java b/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationReactiveTest.java
index d0f81029c73..0d2e2069af2 100644
--- a/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationReactiveTest.java
+++ b/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationReactiveTest.java
@@ -26,8 +26,6 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
@@ -36,7 +34,6 @@
  *
  * @author Jakub Bednar (bednar@github) (07/05/2019 12:59)
  */
-@RunWith(JUnitPlatform.class)
 class InfluxDB2AutoConfigurationReactiveTest {
 
     private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
diff --git a/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationTest.java b/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationTest.java
index c38b212e2dc..b38810bf447 100644
--- a/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationTest.java
+++ b/spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationTest.java
@@ -31,8 +31,6 @@
 import okhttp3.Protocol;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -46,7 +44,6 @@
  *
  * @author Jakub Bednar (bednar@github) (07/05/2019 12:59)
  */
-@RunWith(JUnitPlatform.class)
 class InfluxDB2AutoConfigurationTest {
 
     private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()

From dc050aea6cbdb6356af6b48ca689efe57a7eeb8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Sep 2022 08:41:56 +0200
Subject: [PATCH 16/55] chore(deps-dev): bump spring-test from 5.3.22 to 5.3.23
 (#425)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps-dev): bump spring-test from 5.3.22 to 5.3.23

Bumps [spring-test](https://github.com/spring-projects/spring-framework) from 5.3.22 to 5.3.23.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.22...v5.3.23)

---
updated-dependencies:
- dependency-name: org.springframework:spring-test
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md   | 1 +
 spring/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8800a8c9ca9..e165d6066f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ Update dependencies:
 #### Test:
   - [#422](https://github.com/influxdata/influxdb-client-java/pull/422): `logback-classic` to `1.3.1`
   - [#417](https://github.com/influxdata/influxdb-client-java/pull/417): `mockito` to `4.8.0`
+  - [#425](https://github.com/influxdata/influxdb-client-java/pull/425): `spring-test` to `5.3.23`
                
 Remove dependencies:
 #### Test:
diff --git a/spring/pom.xml b/spring/pom.xml
index 3ce4e70cee2..2ee14529b91 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -74,7 +74,7 @@
     
         1.9.4
         2.7.3
-        5.3.22
+        5.3.23
     
 
     

From d46c2400006ab3323b564804ef1088bea2f4b6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Bedn=C3=A1=C5=99?= 
Date: Sat, 17 Sep 2022 06:00:28 +0200
Subject: [PATCH 17/55] fix: mapping `Number` types to POJO query output (#414)

---
 CHANGELOG.md                                  |  3 +
 .../query/internal/FluxResultMapper.java      | 52 +++++++++--
 .../query/internal/FluxResultMapperTest.java  | 91 +++++++++++++++++++
 3 files changed, 137 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e165d6066f1..94093ea547b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ### Features
 1. [#419](https://github.com/influxdata/influxdb-client-java/pull/419): Add possibility to get time from `Point` data structure
 
+### Bug Fixes
+1. [#414](https://github.com/influxdata/influxdb-client-java/pull/414): Mapping `Number` types to POJO query output
+
 ### Documentation
 1. [#406](https://github.com/influxdata/influxdb-client-java/pull/406): Fix compatibility of the `doclint` between JDK 8 and JDK 18
 
diff --git a/client-core/src/main/java/com/influxdb/query/internal/FluxResultMapper.java b/client-core/src/main/java/com/influxdb/query/internal/FluxResultMapper.java
index e75a63f8cbe..d2544a22697 100644
--- a/client-core/src/main/java/com/influxdb/query/internal/FluxResultMapper.java
+++ b/client-core/src/main/java/com/influxdb/query/internal/FluxResultMapper.java
@@ -129,16 +129,24 @@ private void setFieldValue(@Nonnull final Object object,
             }
 
             //convert primitives
-            if (double.class.isAssignableFrom(fieldType)) {
-                field.setDouble(object, toDoubleValue(value));
+            if (double.class.isAssignableFrom(fieldType) || Double.class.isAssignableFrom(fieldType)) {
+                field.set(object, toDoubleValue(value));
                 return;
             }
-            if (long.class.isAssignableFrom(fieldType)) {
-                field.setLong(object, toLongValue(value));
+            if (long.class.isAssignableFrom(fieldType) || Long.class.isAssignableFrom(fieldType)) {
+                field.set(object, toLongValue(value));
                 return;
             }
-            if (int.class.isAssignableFrom(fieldType)) {
-                field.setInt(object, toIntValue(value));
+            if (int.class.isAssignableFrom(fieldType) || Integer.class.isAssignableFrom(fieldType)) {
+                field.set(object, toIntValue(value));
+                return;
+            }
+            if (float.class.isAssignableFrom(fieldType) || Float.class.isAssignableFrom(fieldType)) {
+                field.set(object, toFloatValue(value));
+                return;
+            }
+            if (short.class.isAssignableFrom(fieldType) || Short.class.isAssignableFrom(fieldType)) {
+                field.set(object, toShortValue(value));
                 return;
             }
             if (boolean.class.isAssignableFrom(fieldType)) {
@@ -172,7 +180,7 @@ private double toDoubleValue(final Object value) {
             return (double) value;
         }
 
-        return (Double) value;
+        return ((Number) value).doubleValue();
     }
 
     private long toLongValue(final Object value) {
@@ -181,7 +189,7 @@ private long toLongValue(final Object value) {
             return (long) value;
         }
 
-        return ((Double) value).longValue();
+        return ((Number) value).longValue();
     }
 
     private int toIntValue(final Object value) {
@@ -190,7 +198,25 @@ private int toIntValue(final Object value) {
             return (int) value;
         }
 
-        return ((Double) value).intValue();
+        return ((Number) value).intValue();
+    }
+
+    private float toFloatValue(final Object value) {
+
+        if (float.class.isAssignableFrom(value.getClass()) || Float.class.isAssignableFrom(value.getClass())) {
+            return (float) value;
+        }
+
+        return ((Number) value).floatValue();
+    }
+
+    private short toShortValue(final Object value) {
+
+        if (short.class.isAssignableFrom(value.getClass()) || Short.class.isAssignableFrom(value.getClass())) {
+            return (short) value;
+        }
+
+        return ((Number) value).shortValue();
     }
 
     private BigDecimal toBigDecimalValue(final Object value) {
@@ -210,6 +236,14 @@ private BigDecimal toBigDecimalValue(final Object value) {
             return BigDecimal.valueOf((long) value);
         }
 
+        if (float.class.isAssignableFrom(value.getClass()) || Float.class.isAssignableFrom(value.getClass())) {
+            return BigDecimal.valueOf((float) value);
+        }
+
+        if (short.class.isAssignableFrom(value.getClass()) || Short.class.isAssignableFrom(value.getClass())) {
+            return BigDecimal.valueOf((short) value);
+        }
+
         String message = String.format("Cannot cast %s [%s] to %s.",
                 value.getClass().getName(), value, BigDecimal.class);
 
diff --git a/client-core/src/test/java/com/influxdb/query/internal/FluxResultMapperTest.java b/client-core/src/test/java/com/influxdb/query/internal/FluxResultMapperTest.java
index 4c8ef932490..0681443bb7d 100644
--- a/client-core/src/test/java/com/influxdb/query/internal/FluxResultMapperTest.java
+++ b/client-core/src/test/java/com/influxdb/query/internal/FluxResultMapperTest.java
@@ -114,6 +114,82 @@ public void pojoWithMeasurement() {
         Assertions.assertThat(bean.value).isEqualByComparingTo(new BigDecimal(20));
     }
 
+    @Test
+    public void numberConversion() {
+
+        FluxRecord record = new FluxRecord(0);
+
+        record.getValues().put("fieldLong", 55);
+        record.getValues().put("fieldDouble", 55);
+        record.getValues().put("fieldInt", 55);
+        record.getValues().put("fieldFloat", 55);
+        record.getValues().put("fieldShort", 55);
+        record.getValues().put("fieldBigDecimal", 55);
+        NumberFields bean = mapper.toPOJO(record, NumberFields.class);
+        Assertions.assertThat(bean.fieldLong).isEqualTo(55L);
+        Assertions.assertThat(bean.fieldDouble).isEqualTo(55.0);
+        Assertions.assertThat(bean.fieldInt).isEqualTo(55);
+        Assertions.assertThat(bean.fieldFloat).isEqualTo(55F);
+        Assertions.assertThat(bean.fieldShort).isEqualTo((short) 55);
+        Assertions.assertThat(bean.fieldBigDecimal).isEqualByComparingTo(BigDecimal.valueOf(55));
+
+        record.getValues().put("fieldLong", 55.0);
+        record.getValues().put("fieldDouble", 55.0);
+        record.getValues().put("fieldInt", 55.0);
+        record.getValues().put("fieldFloat", 55.0);
+        record.getValues().put("fieldShort", 55.0);
+        record.getValues().put("fieldBigDecimal", 55.0);
+        bean = mapper.toPOJO(record, NumberFields.class);
+        Assertions.assertThat(bean.fieldLong).isEqualTo(55L);
+        Assertions.assertThat(bean.fieldDouble).isEqualTo(55.0);
+        Assertions.assertThat(bean.fieldInt).isEqualTo(55);
+        Assertions.assertThat(bean.fieldFloat).isEqualTo(55F);
+        Assertions.assertThat(bean.fieldShort).isEqualTo((short) 55);
+        Assertions.assertThat(bean.fieldBigDecimal).isEqualByComparingTo(BigDecimal.valueOf(55));
+
+        record.getValues().put("fieldLong", 55L);
+        record.getValues().put("fieldDouble", 55L);
+        record.getValues().put("fieldInt", 55L);
+        record.getValues().put("fieldFloat", 55L);
+        record.getValues().put("fieldShort", 55L);
+        record.getValues().put("fieldBigDecimal", 55L);
+        bean = mapper.toPOJO(record, NumberFields.class);
+        Assertions.assertThat(bean.fieldLong).isEqualTo(55L);
+        Assertions.assertThat(bean.fieldDouble).isEqualTo(55.0);
+        Assertions.assertThat(bean.fieldInt).isEqualTo(55);
+        Assertions.assertThat(bean.fieldFloat).isEqualTo(55F);
+        Assertions.assertThat(bean.fieldShort).isEqualTo((short) 55);
+        Assertions.assertThat(bean.fieldBigDecimal).isEqualByComparingTo(BigDecimal.valueOf(55));
+
+        record.getValues().put("fieldLong", 55F);
+        record.getValues().put("fieldDouble", 55F);
+        record.getValues().put("fieldInt", 55F);
+        record.getValues().put("fieldFloat", 55F);
+        record.getValues().put("fieldShort", 55f);
+        record.getValues().put("fieldBigDecimal", 55f);
+        bean = mapper.toPOJO(record, NumberFields.class);
+        Assertions.assertThat(bean.fieldLong).isEqualTo(55L);
+        Assertions.assertThat(bean.fieldDouble).isEqualTo(55.0);
+        Assertions.assertThat(bean.fieldInt).isEqualTo(55);
+        Assertions.assertThat(bean.fieldFloat).isEqualTo(55F);
+        Assertions.assertThat(bean.fieldShort).isEqualTo((short) 55);
+        Assertions.assertThat(bean.fieldBigDecimal).isEqualByComparingTo(BigDecimal.valueOf(55));
+
+        record.getValues().put("fieldLong", (short) 55);
+        record.getValues().put("fieldDouble", (short) 55);
+        record.getValues().put("fieldInt", (short) 55);
+        record.getValues().put("fieldFloat", (short) 55);
+        record.getValues().put("fieldShort", (short) 55);
+        record.getValues().put("fieldBigDecimal", (short) 55);
+        bean = mapper.toPOJO(record, NumberFields.class);
+        Assertions.assertThat(bean.fieldLong).isEqualTo(55L);
+        Assertions.assertThat(bean.fieldDouble).isEqualTo(55.0);
+        Assertions.assertThat(bean.fieldInt).isEqualTo(55);
+        Assertions.assertThat(bean.fieldFloat).isEqualTo(55F);
+        Assertions.assertThat(bean.fieldShort).isEqualTo((short) 55);
+        Assertions.assertThat(bean.fieldBigDecimal).isEqualByComparingTo(BigDecimal.valueOf(55));
+    }
+
     public static class BigDecimalBean {
         @Column(name = "value1")
         BigDecimal value1;
@@ -166,4 +242,19 @@ public static class BeanWithMeasurement {
         @Column(name = "value")
         BigDecimal value;
     }
+
+    public static class NumberFields {
+        @Column
+        private Long fieldLong;
+        @Column
+        private Double fieldDouble;
+        @Column
+        private Integer fieldInt;
+        @Column
+        private Float fieldFloat;
+        @Column
+        private Short fieldShort;
+        @Column
+        private BigDecimal fieldBigDecimal;
+    }
 }

From ee580792af4237b5cdf85ce75c2525532fd755e5 Mon Sep 17 00:00:00 2001
From: Jakub Bednar 
Date: Mon, 19 Sep 2022 08:44:08 +0200
Subject: [PATCH 18/55] fix: flaky tests

---
 client/src/test/java/com/influxdb/client/ITTasksApi.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/test/java/com/influxdb/client/ITTasksApi.java b/client/src/test/java/com/influxdb/client/ITTasksApi.java
index 15d703610a4..9f399eb4604 100644
--- a/client/src/test/java/com/influxdb/client/ITTasksApi.java
+++ b/client/src/test/java/com/influxdb/client/ITTasksApi.java
@@ -685,7 +685,12 @@ void cancelRunNotExist() throws InterruptedException {
 
         List runs = tasksApi.getRuns(task);
 
-        Assertions.assertThatThrownBy(() -> tasksApi.cancelRun(runs.get(0)))
+        Run run = runs.stream()
+                .filter(it -> it.getStatus().equals(Run.StatusEnum.SUCCESS))
+                .findFirst()
+                .get();
+
+        Assertions.assertThatThrownBy(() -> tasksApi.cancelRun(run))
                 .isInstanceOf(NotFoundException.class)
                 .hasMessage("HTTP status code: 404; Message: failed to cancel run: run not found");
     }

From 090d7f8603000877a9699944df278df567f24cdc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 08:53:37 +0200
Subject: [PATCH 19/55] chore(deps): bump maven-jar-plugin from 3.2.2 to 3.3.0
 (#426)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump maven-jar-plugin from 3.2.2 to 3.3.0

Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.2.2 to 3.3.0.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.2.2...maven-jar-plugin-3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-jar-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md | 1 +
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94093ea547b..265c02aec80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ Update dependencies:
   
 #### Maven Plugin:
   - [#413](https://github.com/influxdata/influxdb-client-java/pull/413): `versions-maven-plugin` to `2.12.0`
+  - [#426](https://github.com/influxdata/influxdb-client-java/pull/426): `maven-jar-plugin` to `3.3.0`
 
 #### Provided:
   - [#424](https://github.com/influxdata/influxdb-client-java/pull/424): `slf4j-api` to `2.0.1`
diff --git a/pom.xml b/pom.xml
index 5238bfb2586..8df365061cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,7 +155,7 @@
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.2.2
+                3.3.0
                 
                     
                         

From 88d862c8ae02e216606ffdd4c2a1464afbc5d38e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Sep 2022 09:05:33 +0200
Subject: [PATCH 20/55] chore(deps): bump slf4j-api from 2.0.1 to 2.0.2 (#428)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump slf4j-api from 2.0.1 to 2.0.2

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/commits)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md        | 2 +-
 client-osgi/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 265c02aec80..89aac212555 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,7 @@ Update dependencies:
   - [#426](https://github.com/influxdata/influxdb-client-java/pull/426): `maven-jar-plugin` to `3.3.0`
 
 #### Provided:
-  - [#424](https://github.com/influxdata/influxdb-client-java/pull/424): `slf4j-api` to `2.0.1`
+  - [#428](https://github.com/influxdata/influxdb-client-java/pull/428): `slf4j-api` to `2.0.2`
 
 #### Test:
   - [#422](https://github.com/influxdata/influxdb-client-java/pull/422): `logback-classic` to `1.3.1`
diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml
index 5450748b3ce..8fac1af3594 100644
--- a/client-osgi/pom.xml
+++ b/client-osgi/pom.xml
@@ -151,7 +151,7 @@
         
             org.slf4j
             slf4j-api
-            2.0.1
+            2.0.2
             provided
         
 

From d2173b4f5309d009caabfbbbe8a340167fc10607 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Sep 2022 09:17:36 +0200
Subject: [PATCH 21/55] chore(deps): bump junit-jupiter.version from 5.9.0 to
 5.9.1 (#427)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump junit-jupiter.version from 5.9.0 to 5.9.1

Bumps `junit-jupiter.version` from 5.9.0 to 5.9.1.

Updates `junit-vintage-engine` from 5.9.0 to 5.9.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1)

Updates `junit-jupiter-engine` from 5.9.0 to 5.9.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1)

Updates `junit-jupiter-api` from 5.9.0 to 5.9.1
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.0...r5.9.1)

---
updated-dependencies:
- dependency-name: org.junit.vintage:junit-vintage-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md | 1 +
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89aac212555..ae1cde7b2c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ Update dependencies:
   - [#422](https://github.com/influxdata/influxdb-client-java/pull/422): `logback-classic` to `1.3.1`
   - [#417](https://github.com/influxdata/influxdb-client-java/pull/417): `mockito` to `4.8.0`
   - [#425](https://github.com/influxdata/influxdb-client-java/pull/425): `spring-test` to `5.3.23`
+  - [#427](https://github.com/influxdata/influxdb-client-java/pull/427): `junit-jupiter-engine` to `5.9.1`
                
 Remove dependencies:
 #### Test:
diff --git a/pom.xml b/pom.xml
index 8df365061cb..094e2e63cd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
         4.7.1
 
         1.7.10
-        5.9.0
+        5.9.1
         1.6.4
         4.8.0
     

From bf81e894cde35e0005ef83dd1c12844cc68f17cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 08:30:02 +0200
Subject: [PATCH 22/55] chore(deps): bump spring-boot.version from 2.7.3 to
 2.7.4 (#430)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump spring-boot.version from 2.7.3 to 2.7.4

Bumps `spring-boot.version` from 2.7.3 to 2.7.4.

Updates `spring-boot-actuator-autoconfigure` from 2.7.3 to 2.7.4
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.3...v2.7.4)

Updates `spring-boot-test` from 2.7.3 to 2.7.4
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.3...v2.7.4)

Updates `spring-boot-configuration-processor` from 2.7.3 to 2.7.4
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.3...v2.7.4)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-actuator-autoconfigure
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.springframework.boot:spring-boot-test
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: org.springframework.boot:spring-boot-configuration-processor
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md   | 1 +
 spring/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae1cde7b2c8..9085dbc1417 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ Update dependencies:
   - [#412](https://github.com/influxdata/influxdb-client-java/pull/412), [#416](https://github.com/influxdata/influxdb-client-java/pull/416): `akka` to `2.6.20`
   - [#420](https://github.com/influxdata/influxdb-client-java/pull/420): `micrometer-registry-influx` to `1.9.4`
   - [#423](https://github.com/influxdata/influxdb-client-java/pull/423): `scala-library` to `2.12.17`
+  - [#430](https://github.com/influxdata/influxdb-client-java/pull/430): `spring-boot` to `2.7.4`
   
 #### Maven Plugin:
   - [#413](https://github.com/influxdata/influxdb-client-java/pull/413): `versions-maven-plugin` to `2.12.0`
diff --git a/spring/pom.xml b/spring/pom.xml
index 2ee14529b91..a7841707748 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -73,7 +73,7 @@
 
     
         1.9.4
-        2.7.3
+        2.7.4
         5.3.23
     
 

From 9f918485cec5d054a5512eef7d25c2d5b71db5b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 09:31:44 +0200
Subject: [PATCH 23/55] chore(deps): bump scala-maven-plugin from 4.7.1 to
 4.7.2 (#432)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump scala-maven-plugin from 4.7.1 to 4.7.2

Bumps scala-maven-plugin from 4.7.1 to 4.7.2.

---
updated-dependencies:
- dependency-name: net.alchim31.maven:scala-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md | 1 +
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9085dbc1417..58a679f113a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ Update dependencies:
 #### Maven Plugin:
   - [#413](https://github.com/influxdata/influxdb-client-java/pull/413): `versions-maven-plugin` to `2.12.0`
   - [#426](https://github.com/influxdata/influxdb-client-java/pull/426): `maven-jar-plugin` to `3.3.0`
+  - [#432](https://github.com/influxdata/influxdb-client-java/pull/432): `scala-maven-plugin` to `4.7.2`
 
 #### Provided:
   - [#428](https://github.com/influxdata/influxdb-client-java/pull/428): `slf4j-api` to `2.0.2`
diff --git a/pom.xml b/pom.xml
index 094e2e63cd2..a1aea46450e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
         3.2.0
         0.8.8
         3.12.1
-        4.7.1
+        4.7.2
 
         1.7.10
         5.9.1

From 0676d6c7585c886f0d83ab3b5f2a7de54c5ec8ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 09:45:14 +0200
Subject: [PATCH 24/55] chore(deps): bump slf4j-api from 2.0.2 to 2.0.3 (#431)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump slf4j-api from 2.0.2 to 2.0.3

Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.2...v_2.0.3)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md        | 2 +-
 client-osgi/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58a679f113a..bf2c8c78377 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,7 @@ Update dependencies:
   - [#432](https://github.com/influxdata/influxdb-client-java/pull/432): `scala-maven-plugin` to `4.7.2`
 
 #### Provided:
-  - [#428](https://github.com/influxdata/influxdb-client-java/pull/428): `slf4j-api` to `2.0.2`
+  - [#431](https://github.com/influxdata/influxdb-client-java/pull/431): `slf4j-api` to `2.0.3`
 
 #### Test:
   - [#422](https://github.com/influxdata/influxdb-client-java/pull/422): `logback-classic` to `1.3.1`
diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml
index 8fac1af3594..8be190bd732 100644
--- a/client-osgi/pom.xml
+++ b/client-osgi/pom.xml
@@ -151,7 +151,7 @@
         
             org.slf4j
             slf4j-api
-            2.0.2
+            2.0.3
             provided
         
 

From f92cc97210406d6e42afc30e00d2d4b0f0d3a2ae Mon Sep 17 00:00:00 2001
From: Jakub Bednar 
Date: Thu, 29 Sep 2022 10:27:16 +0200
Subject: [PATCH 25/55] chore: speed up build

---
 scripts/publish-site.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/publish-site.sh b/scripts/publish-site.sh
index 6266ac1dba8..f54f57b1b6e 100755
--- a/scripts/publish-site.sh
+++ b/scripts/publish-site.sh
@@ -28,7 +28,7 @@ SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
 
 # Generate Site
 cd "${SCRIPT_PATH}"/..
-mvn clean site site:stage -DskipTests
+mvn site site:stage -DskipTests
 # Copy Kotlin doc
 cp -R "${SCRIPT_PATH}"/../client-kotlin/target/dokka/ "${SCRIPT_PATH}"/../target/staging/influxdb-client-kotlin/dokka/
 
@@ -40,7 +40,7 @@ cp -R "${SCRIPT_PATH}"/../target/staging/ "${HOME}"/site
 echo "Clone: gh-pages"
 cd "${HOME}"
 rm -rf "${HOME}"/gh-pages
-git clone --branch=gh-pages git@github.com:influxdata/influxdb-client-java.git "${HOME}"/gh-pages
+git clone --depth 1 --branch=gh-pages git@github.com:influxdata/influxdb-client-java.git "${HOME}"/gh-pages
 
 echo "Copy site"
 # Push Site
@@ -51,7 +51,8 @@ cp -Rf "${HOME}"/site/* ./
 ls
 
 echo "Copy CircleCI"
-cp -R "${SCRIPT_PATH}"/../.circleci/ "${HOME}"/gh-pages/
+mkdir "${HOME}"/gh-pages/.circleci/ || true
+cp "${SCRIPT_PATH}"/../.circleci/config.yml "${HOME}"/gh-pages/.circleci/config.yml
 
 
 echo "Commit"

From f7aed3d390b5aa85680ba39b64bad2c4df5c12da Mon Sep 17 00:00:00 2001
From: Jakub Bednar 
Date: Thu, 29 Sep 2022 16:07:24 +0200
Subject: [PATCH 26/55] chore(release): release version 6.6.0 [skip ci]

---
 CHANGELOG.md              |  2 +-
 README.md                 | 12 ++++++------
 client-kotlin/README.md   |  4 ++--
 client-legacy/README.md   |  4 ++--
 client-reactive/README.md |  4 ++--
 client-scala/README.md    |  8 ++++----
 client/README.md          |  4 ++--
 flux-dsl/README.md        |  4 ++--
 spring/README.md          |  4 ++--
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf2c8c78377..00f3197a527 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 6.6.0 [unreleased]
+## 6.6.0 [2022-09-29]
 
 ### Features
 1. [#419](https://github.com/influxdata/influxdb-client-java/pull/419): Add possibility to get time from `Point` data structure
diff --git a/README.md b/README.md
index a73f2a7a1a2..e21e51cb4f3 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ Download the latest version:
 
     com.influxdb
     influxdb-client-java
-    6.5.0
+    6.6.0
 
 ```
        
@@ -110,7 +110,7 @@ Download the latest version:
 
 ```groovy
 dependencies {
-    implementation "com.influxdb:influxdb-client-java:6.5.0"
+    implementation "com.influxdb:influxdb-client-java:6.6.0"
 }
 ```
 
@@ -218,7 +218,7 @@ Download the latest version:
 
     com.influxdb
     influxdb-client-java
-    6.5.0
+    6.6.0
 
 ```
        
@@ -226,7 +226,7 @@ Download the latest version:
 
 ```groovy
 dependencies {
-    implementation "com.influxdb:influxdb-client-java:6.5.0"
+    implementation "com.influxdb:influxdb-client-java:6.6.0"
 }
 ```
 
@@ -319,7 +319,7 @@ Download the latest version:
 
     com.influxdb
     influxdb-client-flux
-    6.5.0
+    6.6.0
 
 ```
        
@@ -327,7 +327,7 @@ Download the latest version:
 
 ```groovy
 dependencies {
-    implementation "com.influxdb:influxdb-client-flux:6.5.0"
+    implementation "com.influxdb:influxdb-client-flux:6.6.0"
 }
 ``` 
 
diff --git a/client-kotlin/README.md b/client-kotlin/README.md
index b89b985e6f6..29b1ad4f04a 100644
--- a/client-kotlin/README.md
+++ b/client-kotlin/README.md
@@ -303,14 +303,14 @@ The latest version for Maven dependency:
 
   com.influxdb
   influxdb-client-kotlin
-  6.5.0
+  6.6.0
 
 ```
   
 Or when using with Gradle:
 ```groovy
 dependencies {
-    implementation "com.influxdb:influxdb-client-kotlin:6.5.0"
+    implementation "com.influxdb:influxdb-client-kotlin:6.6.0"
 }
 ```
 
diff --git a/client-legacy/README.md b/client-legacy/README.md
index 904b8b9ad6f..e9786b1ba35 100644
--- a/client-legacy/README.md
+++ b/client-legacy/README.md
@@ -162,14 +162,14 @@ The latest version for Maven dependency:
 
   com.influxdb
   influxdb-client-flux
-  6.5.0
+  6.6.0
 
 ```
   
 Or when using with Gradle:
 ```groovy
 dependencies {
-    implementation "com.influxdb:influxdb-client-flux:6.5.0"
+    implementation "com.influxdb:influxdb-client-flux:6.6.0"
 }
 ```
 
diff --git a/client-reactive/README.md b/client-reactive/README.md
index dba060fab9a..5c5a9e9d79e 100644
--- a/client-reactive/README.md
+++ b/client-reactive/README.md
@@ -433,14 +433,14 @@ The latest version for Maven dependency:
 
   com.influxdb
   influxdb-client-reactive
-  6.5.0
+  6.6.0
 
 ```
   
 Or when using with Gradle:
 ```groovy
 dependencies {
-    implementation "com.influxdb:influxdb-client-reactive:6.5.0"
+    implementation "com.influxdb:influxdb-client-reactive:6.6.0"
 }
 ```
 
diff --git a/client-scala/README.md b/client-scala/README.md
index 8a842a1d2c2..c6c96f1a98f 100644
--- a/client-scala/README.md
+++ b/client-scala/README.md
@@ -257,14 +257,14 @@ The latest version for Maven dependency:
 
   com.influxdb
   influxdb-client-scala_2.12
-  6.5.0
+  6.6.0
 
 ```
   
 Or when using with Gradle:
 ```groovy
 dependencies {
-    implementation "com.influxdb:influxdb-client-scala_2.12:6.5.0"
+    implementation "com.influxdb:influxdb-client-scala_2.12:6.6.0"
 }
 ```
 
@@ -275,14 +275,14 @@ The latest version for Maven dependency:
 
   com.influxdb
   influxdb-client-scala_2.13
-  6.5.0
+  6.6.0
 
 ```
   
 Or when using with Gradle:
 ```groovy
 dependencies {
-    implementation "com.influxdb:influxdb-client-scala_2.13:6.5.0"
+    implementation "com.influxdb:influxdb-client-scala_2.13:6.6.0"
 }
 ```
 
diff --git a/client/README.md b/client/README.md
index 45852e13703..15232399fcb 100644
--- a/client/README.md
+++ b/client/README.md
@@ -1308,14 +1308,14 @@ The latest version for Maven dependency:
 
   com.influxdb
   influxdb-client-java
-  6.5.0
+  6.6.0
 
 ```
   
 Or when using with Gradle:
 ```groovy
 dependencies {
-    implementation "com.influxdb:influxdb-client-java:6.5.0"
+    implementation "com.influxdb:influxdb-client-java:6.6.0"
 }
 ```
 
diff --git a/flux-dsl/README.md b/flux-dsl/README.md
index 08e0000cbf6..80a690e444c 100644
--- a/flux-dsl/README.md
+++ b/flux-dsl/README.md
@@ -1097,14 +1097,14 @@ The latest version for Maven dependency:
 
   com.influxdb
   flux-dsl
-  6.5.0
+  6.6.0
 
 ```
 
 Or when using with Gradle:
 ```groovy
 dependencies {
-    implementation "com.influxdb:flux-dsl:6.5.0"
+    implementation "com.influxdb:flux-dsl:6.6.0"
 }
 ```
 
diff --git a/spring/README.md b/spring/README.md
index 0230254902f..a416afe4bbf 100644
--- a/spring/README.md
+++ b/spring/README.md
@@ -99,13 +99,13 @@ The latest version for Maven dependency:
 
   com.influxdb
   influxdb-spring
-  6.5.0
+  6.6.0
 
 ```
   
 Or when using with Gradle:
 ```groovy
 dependencies {
-    implementation "com.influxdb:influxdb-spring:6.5.0"
+    implementation "com.influxdb:influxdb-spring:6.6.0"
 }
 ```

From ee1173d4f37df12ba7a1ed185aa906c5a9fe860a Mon Sep 17 00:00:00 2001
From: Jakub Bednar 
Date: Thu, 29 Sep 2022 16:17:24 +0200
Subject: [PATCH 27/55] [maven-release-plugin] prepare release v6.6.0

---
 client-core/pom.xml             |  4 ++--
 client-kotlin/pom.xml           |  4 ++--
 client-legacy/pom.xml           |  4 ++--
 client-osgi/pom.xml             |  4 ++--
 client-reactive/pom.xml         |  4 ++--
 client-scala/cross/2.12/pom.xml |  4 ++--
 client-scala/cross/2.13/pom.xml |  4 ++--
 client-test/pom.xml             |  4 ++--
 client-utils/pom.xml            |  4 ++--
 client/pom.xml                  |  4 ++--
 examples/pom.xml                |  4 ++--
 flux-dsl/pom.xml                |  4 ++--
 karaf/karaf-assembly/pom.xml    |  2 +-
 karaf/karaf-features/pom.xml    |  2 +-
 karaf/karaf-kar/pom.xml         |  4 ++--
 karaf/pom.xml                   |  4 ++--
 pom.xml                         | 16 ++++++++--------
 spring/pom.xml                  |  6 +++---
 18 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/client-core/pom.xml b/client-core/pom.xml
index 79b63399f0f..eb6a798ceba 100644
--- a/client-core/pom.xml
+++ b/client-core/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
 
     influxdb-client-core
@@ -66,7 +66,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      HEAD
+      v6.6.0
   
     
     
diff --git a/client-kotlin/pom.xml b/client-kotlin/pom.xml
index 91aa34030ad..1217e84d9ac 100644
--- a/client-kotlin/pom.xml
+++ b/client-kotlin/pom.xml
@@ -26,7 +26,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
     4.0.0
 
@@ -72,7 +72,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      HEAD
+      v6.6.0
   
 
     
diff --git a/client-legacy/pom.xml b/client-legacy/pom.xml
index 9141f8a8e1e..e872586a683 100644
--- a/client-legacy/pom.xml
+++ b/client-legacy/pom.xml
@@ -28,7 +28,7 @@
     
         com.influxdb
         influxdb-client
-        6.6.0-SNAPSHOT
+        6.6.0
     
 
     influxdb-client-flux
@@ -66,7 +66,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      HEAD
+      v6.6.0
   
 
     
diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml
index 8be190bd732..917b9949019 100644
--- a/client-osgi/pom.xml
+++ b/client-osgi/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
 
     influxdb-client-osgi
@@ -65,7 +65,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-        HEAD
+        v6.6.0
     
 
     
diff --git a/client-reactive/pom.xml b/client-reactive/pom.xml
index 677b8fbad49..346b243f533 100644
--- a/client-reactive/pom.xml
+++ b/client-reactive/pom.xml
@@ -26,7 +26,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
     4.0.0
 
@@ -68,7 +68,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      HEAD
+      v6.6.0
   
 
     
diff --git a/client-scala/cross/2.12/pom.xml b/client-scala/cross/2.12/pom.xml
index 213a793c865..8892d08b5dd 100644
--- a/client-scala/cross/2.12/pom.xml
+++ b/client-scala/cross/2.12/pom.xml
@@ -26,7 +26,7 @@
   
     influxdb-client
     com.influxdb
-    6.6.0-SNAPSHOT
+    6.6.0
     ../../../pom.xml
   
   4.0.0
@@ -68,7 +68,7 @@
     scm:git:git@github.com:influxdata/influxdb-client-java.git
     scm:git:git@github.com:influxdata/influxdb-client-java.git
     https://github.com/influxdata/influxdb-client-java/tree/master
-    HEAD
+    v6.6.0
   
 
   
diff --git a/client-scala/cross/2.13/pom.xml b/client-scala/cross/2.13/pom.xml
index 80b3ebfd50e..c09745b0e80 100644
--- a/client-scala/cross/2.13/pom.xml
+++ b/client-scala/cross/2.13/pom.xml
@@ -26,7 +26,7 @@
   
     influxdb-client
     com.influxdb
-    6.6.0-SNAPSHOT
+    6.6.0
     ../../../pom.xml
   
   4.0.0
@@ -68,7 +68,7 @@
     scm:git:git@github.com:influxdata/influxdb-client-java.git
     scm:git:git@github.com:influxdata/influxdb-client-java.git
     https://github.com/influxdata/influxdb-client-java/tree/master
-    HEAD
+    v6.6.0
   
 
   
diff --git a/client-test/pom.xml b/client-test/pom.xml
index 2918c6586da..88fb80bda23 100644
--- a/client-test/pom.xml
+++ b/client-test/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
 
     influxdb-client-test
@@ -68,7 +68,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      HEAD
+      v6.6.0
   
 
     
diff --git a/client-utils/pom.xml b/client-utils/pom.xml
index d1df0ac0508..888e49d9c88 100644
--- a/client-utils/pom.xml
+++ b/client-utils/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
 
     influxdb-client-utils
@@ -66,7 +66,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-        HEAD
+        v6.6.0
     
 
     
diff --git a/client/pom.xml b/client/pom.xml
index 3af6f06f42b..246764603c6 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -26,7 +26,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
     4.0.0
 
@@ -68,7 +68,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      HEAD
+      v6.6.0
   
     
     
diff --git a/examples/pom.xml b/examples/pom.xml
index 4cde9e902f7..a601696437f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -27,12 +27,12 @@
     
         influxdb-client
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
 
     
         true
-        6.6.0-SNAPSHOT
+        6.6.0
     
 
     4.0.0
diff --git a/flux-dsl/pom.xml b/flux-dsl/pom.xml
index e64009732eb..fed092b8ab0 100644
--- a/flux-dsl/pom.xml
+++ b/flux-dsl/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
 
     flux-dsl
@@ -66,7 +66,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      HEAD
+      v6.6.0
   
 
     
diff --git a/karaf/karaf-assembly/pom.xml b/karaf/karaf-assembly/pom.xml
index c8325cc84fb..8f47c5059c1 100644
--- a/karaf/karaf-assembly/pom.xml
+++ b/karaf/karaf-assembly/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-karaf
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
 
     influxdb-karaf-assembly
diff --git a/karaf/karaf-features/pom.xml b/karaf/karaf-features/pom.xml
index 530fe247796..e9f977aa48e 100644
--- a/karaf/karaf-features/pom.xml
+++ b/karaf/karaf-features/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-karaf
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
 
     influxdb-karaf-features
diff --git a/karaf/karaf-kar/pom.xml b/karaf/karaf-kar/pom.xml
index dc0c2144f87..e692a9339cf 100644
--- a/karaf/karaf-kar/pom.xml
+++ b/karaf/karaf-kar/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-karaf
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
 
     influxdb-karaf-kar
@@ -75,7 +75,7 @@
         
             ${project.groupId}
             influxdb-karaf-features
-            6.6.0-SNAPSHOT
+            6.6.0
             features
             xml
         
diff --git a/karaf/pom.xml b/karaf/pom.xml
index b1c861dc232..ed00e3fe159 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
 
     influxdb-karaf
@@ -67,7 +67,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-        HEAD
+        v6.6.0
     
 
     
diff --git a/pom.xml b/pom.xml
index a1aea46450e..7fdbdc5b12b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
     com.influxdb
     influxdb-client
-    6.6.0-SNAPSHOT
+    6.6.0
     pom
 
     
@@ -87,7 +87,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         http://github.com/influxdata/influxdb-client-java/tree/master
-      HEAD
+      v6.6.0
   
 
     
@@ -495,38 +495,38 @@
             
                 com.influxdb
                 influxdb-client-test
-                6.6.0-SNAPSHOT
+                6.6.0
                 test
             
 
             
                 com.influxdb
                 influxdb-client-core
-                6.6.0-SNAPSHOT
+                6.6.0
             
 
             
                 com.influxdb
                 influxdb-client-utils
-                6.6.0-SNAPSHOT
+                6.6.0
             
 
             
                 com.influxdb
                 influxdb-client-java
-                6.6.0-SNAPSHOT
+                6.6.0
             
 
             
                 com.influxdb
                 influxdb-client-reactive
-                6.6.0-SNAPSHOT
+                6.6.0
             
 
             
                 com.influxdb
                 influxdb-client-flux
-                6.6.0-SNAPSHOT
+                6.6.0
             
 
             
diff --git a/spring/pom.xml b/spring/pom.xml
index a7841707748..8e9436d87e7 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -26,12 +26,12 @@
     
         influxdb-client
         com.influxdb
-        6.6.0-SNAPSHOT
+        6.6.0
     
     4.0.0
 
     influxdb-spring
-    6.6.0-SNAPSHOT
+    6.6.0
     jar
 
     Spring Integration for InfluxDB 2.x
@@ -68,7 +68,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      HEAD
+      v6.6.0
   
 
     

From 7bb85da5240f3059bec16981c09677c6747aa76d Mon Sep 17 00:00:00 2001
From: Jakub Bednar 
Date: Thu, 29 Sep 2022 16:17:28 +0200
Subject: [PATCH 28/55] [maven-release-plugin] prepare for next development
 iteration

---
 client-core/pom.xml             |  4 ++--
 client-kotlin/pom.xml           |  4 ++--
 client-legacy/pom.xml           |  4 ++--
 client-osgi/pom.xml             |  4 ++--
 client-reactive/pom.xml         |  4 ++--
 client-scala/cross/2.12/pom.xml |  4 ++--
 client-scala/cross/2.13/pom.xml |  4 ++--
 client-test/pom.xml             |  4 ++--
 client-utils/pom.xml            |  4 ++--
 client/pom.xml                  |  4 ++--
 examples/pom.xml                |  4 ++--
 flux-dsl/pom.xml                |  4 ++--
 karaf/karaf-assembly/pom.xml    |  2 +-
 karaf/karaf-features/pom.xml    |  2 +-
 karaf/karaf-kar/pom.xml         |  4 ++--
 karaf/pom.xml                   |  4 ++--
 pom.xml                         | 16 ++++++++--------
 spring/pom.xml                  |  6 +++---
 18 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/client-core/pom.xml b/client-core/pom.xml
index eb6a798ceba..fa32cd43f4f 100644
--- a/client-core/pom.xml
+++ b/client-core/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
 
     influxdb-client-core
@@ -66,7 +66,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      v6.6.0
+      HEAD
   
     
     
diff --git a/client-kotlin/pom.xml b/client-kotlin/pom.xml
index 1217e84d9ac..4bef0ea42e2 100644
--- a/client-kotlin/pom.xml
+++ b/client-kotlin/pom.xml
@@ -26,7 +26,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
     4.0.0
 
@@ -72,7 +72,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      v6.6.0
+      HEAD
   
 
     
diff --git a/client-legacy/pom.xml b/client-legacy/pom.xml
index e872586a683..59c826608ed 100644
--- a/client-legacy/pom.xml
+++ b/client-legacy/pom.xml
@@ -28,7 +28,7 @@
     
         com.influxdb
         influxdb-client
-        6.6.0
+        6.7.0-SNAPSHOT
     
 
     influxdb-client-flux
@@ -66,7 +66,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      v6.6.0
+      HEAD
   
 
     
diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml
index 917b9949019..580d08682b8 100644
--- a/client-osgi/pom.xml
+++ b/client-osgi/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
 
     influxdb-client-osgi
@@ -65,7 +65,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-        v6.6.0
+        HEAD
     
 
     
diff --git a/client-reactive/pom.xml b/client-reactive/pom.xml
index 346b243f533..e8b279fee14 100644
--- a/client-reactive/pom.xml
+++ b/client-reactive/pom.xml
@@ -26,7 +26,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
     4.0.0
 
@@ -68,7 +68,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      v6.6.0
+      HEAD
   
 
     
diff --git a/client-scala/cross/2.12/pom.xml b/client-scala/cross/2.12/pom.xml
index 8892d08b5dd..796a7f695af 100644
--- a/client-scala/cross/2.12/pom.xml
+++ b/client-scala/cross/2.12/pom.xml
@@ -26,7 +26,7 @@
   
     influxdb-client
     com.influxdb
-    6.6.0
+    6.7.0-SNAPSHOT
     ../../../pom.xml
   
   4.0.0
@@ -68,7 +68,7 @@
     scm:git:git@github.com:influxdata/influxdb-client-java.git
     scm:git:git@github.com:influxdata/influxdb-client-java.git
     https://github.com/influxdata/influxdb-client-java/tree/master
-    v6.6.0
+    HEAD
   
 
   
diff --git a/client-scala/cross/2.13/pom.xml b/client-scala/cross/2.13/pom.xml
index c09745b0e80..2c3e3271839 100644
--- a/client-scala/cross/2.13/pom.xml
+++ b/client-scala/cross/2.13/pom.xml
@@ -26,7 +26,7 @@
   
     influxdb-client
     com.influxdb
-    6.6.0
+    6.7.0-SNAPSHOT
     ../../../pom.xml
   
   4.0.0
@@ -68,7 +68,7 @@
     scm:git:git@github.com:influxdata/influxdb-client-java.git
     scm:git:git@github.com:influxdata/influxdb-client-java.git
     https://github.com/influxdata/influxdb-client-java/tree/master
-    v6.6.0
+    HEAD
   
 
   
diff --git a/client-test/pom.xml b/client-test/pom.xml
index 88fb80bda23..b690122abce 100644
--- a/client-test/pom.xml
+++ b/client-test/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
 
     influxdb-client-test
@@ -68,7 +68,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      v6.6.0
+      HEAD
   
 
     
diff --git a/client-utils/pom.xml b/client-utils/pom.xml
index 888e49d9c88..56825ccf937 100644
--- a/client-utils/pom.xml
+++ b/client-utils/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
 
     influxdb-client-utils
@@ -66,7 +66,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-        v6.6.0
+        HEAD
     
 
     
diff --git a/client/pom.xml b/client/pom.xml
index 246764603c6..d004b94864b 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -26,7 +26,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
     4.0.0
 
@@ -68,7 +68,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      v6.6.0
+      HEAD
   
     
     
diff --git a/examples/pom.xml b/examples/pom.xml
index a601696437f..cf9fce0f416 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -27,12 +27,12 @@
     
         influxdb-client
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
 
     
         true
-        6.6.0
+        6.7.0-SNAPSHOT
     
 
     4.0.0
diff --git a/flux-dsl/pom.xml b/flux-dsl/pom.xml
index fed092b8ab0..4cbf9222d4a 100644
--- a/flux-dsl/pom.xml
+++ b/flux-dsl/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
 
     flux-dsl
@@ -66,7 +66,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      v6.6.0
+      HEAD
   
 
     
diff --git a/karaf/karaf-assembly/pom.xml b/karaf/karaf-assembly/pom.xml
index 8f47c5059c1..7812f19c094 100644
--- a/karaf/karaf-assembly/pom.xml
+++ b/karaf/karaf-assembly/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-karaf
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
 
     influxdb-karaf-assembly
diff --git a/karaf/karaf-features/pom.xml b/karaf/karaf-features/pom.xml
index e9f977aa48e..2eae958c31d 100644
--- a/karaf/karaf-features/pom.xml
+++ b/karaf/karaf-features/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-karaf
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
 
     influxdb-karaf-features
diff --git a/karaf/karaf-kar/pom.xml b/karaf/karaf-kar/pom.xml
index e692a9339cf..ef895101384 100644
--- a/karaf/karaf-kar/pom.xml
+++ b/karaf/karaf-kar/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-karaf
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
 
     influxdb-karaf-kar
@@ -75,7 +75,7 @@
         
             ${project.groupId}
             influxdb-karaf-features
-            6.6.0
+            6.7.0-SNAPSHOT
             features
             xml
         
diff --git a/karaf/pom.xml b/karaf/pom.xml
index ed00e3fe159..ba0db08c477 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -28,7 +28,7 @@
     
         influxdb-client
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
 
     influxdb-karaf
@@ -67,7 +67,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-        v6.6.0
+        HEAD
     
 
     
diff --git a/pom.xml b/pom.xml
index 7fdbdc5b12b..af6b319be7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
     com.influxdb
     influxdb-client
-    6.6.0
+    6.7.0-SNAPSHOT
     pom
 
     
@@ -87,7 +87,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         http://github.com/influxdata/influxdb-client-java/tree/master
-      v6.6.0
+      HEAD
   
 
     
@@ -495,38 +495,38 @@
             
                 com.influxdb
                 influxdb-client-test
-                6.6.0
+                6.7.0-SNAPSHOT
                 test
             
 
             
                 com.influxdb
                 influxdb-client-core
-                6.6.0
+                6.7.0-SNAPSHOT
             
 
             
                 com.influxdb
                 influxdb-client-utils
-                6.6.0
+                6.7.0-SNAPSHOT
             
 
             
                 com.influxdb
                 influxdb-client-java
-                6.6.0
+                6.7.0-SNAPSHOT
             
 
             
                 com.influxdb
                 influxdb-client-reactive
-                6.6.0
+                6.7.0-SNAPSHOT
             
 
             
                 com.influxdb
                 influxdb-client-flux
-                6.6.0
+                6.7.0-SNAPSHOT
             
 
             
diff --git a/spring/pom.xml b/spring/pom.xml
index 8e9436d87e7..ab5e8386a62 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -26,12 +26,12 @@
     
         influxdb-client
         com.influxdb
-        6.6.0
+        6.7.0-SNAPSHOT
     
     4.0.0
 
     influxdb-spring
-    6.6.0
+    6.7.0-SNAPSHOT
     jar
 
     Spring Integration for InfluxDB 2.x
@@ -68,7 +68,7 @@
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         scm:git:git@github.com:influxdata/influxdb-client-java.git
         https://github.com/influxdata/influxdb-client-java/tree/master
-      v6.6.0
+      HEAD
   
 
     

From 90cd10ed4c01aabbc087baf0641b2c4cf7a9a79e Mon Sep 17 00:00:00 2001
From: Jakub Bednar 
Date: Thu, 29 Sep 2022 16:28:22 +0200
Subject: [PATCH 29/55] chore(release): prepare for next development iteration

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00f3197a527..3b5ecc6cf83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 6.7.0 [unreleased]
+
 ## 6.6.0 [2022-09-29]
 
 ### Features

From d824e8216286851fe5ff0138f58b00d85626f5b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Sep 2022 09:04:03 +0200
Subject: [PATCH 30/55] chore(deps): bump kotlin.version from 1.7.10 to 1.7.20
 (#434)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps): bump kotlin.version from 1.7.10 to 1.7.20

Bumps `kotlin.version` from 1.7.10 to 1.7.20.

Updates `kotlin-stdlib` from 1.7.10 to 1.7.20
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20)

Updates `kotlin-maven-plugin` from 1.7.10 to 1.7.20

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md | 6 ++++++
 pom.xml      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b5ecc6cf83..3b2bdf803ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## 6.7.0 [unreleased]
 
+### Dependencies
+Update dependencies:
+
+#### Build:
+  - [#434](https://github.com/influxdata/influxdb-client-java/pull/434): `kotlin` to `1.7.20`
+
 ## 6.6.0 [2022-09-29]
 
 ### Features
diff --git a/pom.xml b/pom.xml
index af6b319be7a..406db9e92e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
         3.12.1
         4.7.2
 
-        1.7.10
+        1.7.20
         5.9.1
         1.6.4
         4.8.0

From 405f749160f445ea55593f806641ae423b56b981 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 06:24:12 +0200
Subject: [PATCH 31/55] chore(deps-dev): bump logback-classic from 1.3.1 to
 1.3.3 (#437)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(deps-dev): bump logback-classic from 1.3.1 to 1.3.3

Bumps [logback-classic](https://github.com/qos-ch/logback) from 1.3.1 to 1.3.3.
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.3.1...v_1.3.3)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

* docs: update CHANGELOG.md

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jakub Bednář 
---
 CHANGELOG.md        | 3 +++
 client-osgi/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b2bdf803ee..4c1033b871a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ Update dependencies:
 #### Build:
   - [#434](https://github.com/influxdata/influxdb-client-java/pull/434): `kotlin` to `1.7.20`
 
+#### Test:
+  - [#437](https://github.com/influxdata/influxdb-client-java/pull/437): `logback-classic` to `1.3.3`
+
 ## 6.6.0 [2022-09-29]
 
 ### Features
diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml
index 580d08682b8..8a75b26704e 100644
--- a/client-osgi/pom.xml
+++ b/client-osgi/pom.xml
@@ -191,7 +191,7 @@
         
             ch.qos.logback
             logback-classic
-            1.3.1
+            1.3.3
             test
             
                 

From 97cbf10063de73fb042f2e168481656ce3f2ddb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Bedn=C3=A1=C5=99?= 
Date: Tue, 4 Oct 2022 08:08:01 +0200
Subject: [PATCH 32/55] chore(deps): update scala to 2.13.9, remove scala
 coverage report plugin (#436)

---
 CHANGELOG.md                    |  1 +
 client-scala/cross/2.13/pom.xml | 34 +--------------------------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c1033b871a..f7b961da6e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Update dependencies:
 
 #### Build:
   - [#434](https://github.com/influxdata/influxdb-client-java/pull/434): `kotlin` to `1.7.20`
+  - [#436](https://github.com/influxdata/influxdb-client-java/pull/436): `scala-library` to `2.13.9`
 
 #### Test:
   - [#437](https://github.com/influxdata/influxdb-client-java/pull/437): `logback-classic` to `1.3.3`
diff --git a/client-scala/cross/2.13/pom.xml b/client-scala/cross/2.13/pom.xml
index 2c3e3271839..3f32ed37836 100644
--- a/client-scala/cross/2.13/pom.xml
+++ b/client-scala/cross/2.13/pom.xml
@@ -72,8 +72,7 @@
   
 
   
-    1.4.11
-    2.13.8
+    2.13.9
     2.6.20
   
 
@@ -130,25 +129,6 @@
         
       
 
-      
-        org.scoverage
-        scoverage-maven-plugin
-        ${scoverage-maven-plugin.version}
-        
-          ${scala.version}
-          
-        
-        
-          
-            report
-            test
-            
-              report
-            
-          
-        
-      
-
       
         com.mycila
         license-maven-plugin
@@ -175,18 +155,6 @@
         scala-maven-plugin
         ${plugin.scala.version}
       
-      
-        org.scoverage
-        scoverage-maven-plugin
-        ${scoverage-maven-plugin.version}
-        
-          
-            
-              report
-            
-          
-        
-      
     
   
 

From ad018cd8f46c02a009a32caaa6703cdd038131a3 Mon Sep 17 00:00:00 2001
From: michaelahojna 
Date: Thu, 6 Oct 2022 13:00:10 +0200
Subject: [PATCH 33/55] feat: add FluxRecord.getRow() with response data stored
 in List (#439)

---
 CHANGELOG.md                                  |  3 +
 .../java/com/influxdb/query/FluxRecord.java   | 14 +++-
 .../query/internal/FluxCsvParser.java         | 19 ++++-
 .../query/internal/FluxCsvParserTest.java     | 19 +++++
 examples/README.md                            |  2 +
 .../main/java/example/RecordRowExample.java   | 81 +++++++++++++++++++
 6 files changed, 136 insertions(+), 2 deletions(-)
 create mode 100644 examples/src/main/java/example/RecordRowExample.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7b961da6e0..868f0af8cfb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## 6.7.0 [unreleased]
 
+### Features
+1. [#439](https://github.com/influxdata/influxdb-client-java/pull/439): Added `FluxRecord.getRow()` which stores response data in a list
+
 ### Dependencies
 Update dependencies:
 
diff --git a/client-core/src/main/java/com/influxdb/query/FluxRecord.java b/client-core/src/main/java/com/influxdb/query/FluxRecord.java
index 68cac54f5e9..98a10c1df11 100644
--- a/client-core/src/main/java/com/influxdb/query/FluxRecord.java
+++ b/client-core/src/main/java/com/influxdb/query/FluxRecord.java
@@ -23,7 +23,9 @@
 
 import java.io.Serializable;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.StringJoiner;
@@ -50,6 +52,8 @@ public final class FluxRecord implements Serializable {
      */
     private LinkedHashMap values = new LinkedHashMap<>();
 
+    private List