diff --git a/CHANGELOG.md b/CHANGELOG.md index b0b07e135aa..d548e319adc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,37 @@ -## 6.13.0 [unreleased] +## 7.0.0 [unreleased] + +:warning: This client version discontinues support for Akka Streams and introduces support for Pekko Streams instead. Apache Pekko is a fork of [Akka](https://github.com/akka/akka) 2.6.x, created after the Akka project adopted the Business Source License, which is not compatible with open-source usage. + +### Features +1. [#661](https://github.com/influxdata/influxdb-client-java/pull/661): Replaced Akka Streams with Pekko Streams in the Scala client. + + +### Dependencies + +Update dependencies: + +#### Build: + - [#664](https://github.com/influxdata/influxdb-client-java/pull/664): `kotlin` to `1.9.22` + - [#666](https://github.com/influxdata/influxdb-client-java/pull/666): `okio` to `3.7.0` + - [#667](https://github.com/influxdata/influxdb-client-java/pull/667): `rxjava` to `3.1.8` + - [#669](https://github.com/influxdata/influxdb-client-java/pull/669): `commons-lang3` to `3.14.0` + - [#670](https://github.com/influxdata/influxdb-client-java/pull/670): `micrometer-registry-influx` to `1.12.1` + +#### Maven: + - [#671](https://github.com/influxdata/influxdb-client-java/pull/671): `maven-javadoc-plugin` to `3.6.3` + +#### Test: + - [#668](https://github.com/influxdata/influxdb-client-java/pull/668): `junit-jupiter` to `5.10.1` + +### Dependencies + +Update dependencies: + +#### Build: + - [#669](https://github.com/influxdata/influxdb-client-java/pull/669): `commons-lang3` to `3.14.0` + +#### Test: + - [#668](https://github.com/influxdata/influxdb-client-java/pull/668): `junit-jupiter` to `5.10.1` ### Dependencies diff --git a/README.md b/README.md index d4b3aaf7763..d78db875c38 100644 --- a/README.md +++ b/README.md @@ -53,14 +53,14 @@ This section contains links to the client library documentation. The Java, Reactive, OSGi, Kotlin and Scala clients are implemented for the InfluxDB 2.x: -| Client | Description | Documentation | Compatibility | -| --- | --- | --- | --- | -| **[java](./client)** | The reference Java client that allows query, write and InfluxDB 2.x management. | [javadoc](https://influxdata.github.io/influxdb-client-java/influxdb-client-java/apidocs/index.html), [readme](./client#influxdb-client-java/)| 2.x | -| **[reactive](./client-reactive)** | The reference RxJava client for the InfluxDB 2.x that allows query and write in a reactive way.| [javadoc](https://influxdata.github.io/influxdb-client-java/influxdb-client-reactive/apidocs/index.html), [readme](./client-reactive#influxdb-client-reactive/) |2.x | -| **[kotlin](./client-kotlin)** | The reference Kotlin client that allows query and write for the InfluxDB 2.x by Kotlin [Channel](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.channels/-channel/index.html) and [Flow](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.flow/-flow/index.html) coroutines. | [KDoc](https://influxdata.github.io/influxdb-client-java/influxdb-client-kotlin/dokka/influxdb-client-kotlin/com.influxdb.client.kotlin/index.html), [readme](./client-kotlin#influxdb-client-kotlin/) | 2.x| -| **[scala](./client-scala)** | The reference Scala client that allows query and write for the InfluxDB 2.x by [Akka Streams](https://doc.akka.io/docs/akka/2.6/stream/). | [Scaladoc](https://influxdata.github.io/influxdb-client-java/client-scala/cross/influxdb-client-scala_2.13/scaladocs/com/influxdb/client/scala/index.html), [readme](./client-scala#influxdb-client-scala/) | 2.x | -| **[osgi](./client-osgi)** | The reference OSGi (R6) client embedding Java and reactive clients and providing standard features (declarative services, configuration, event processing) for the InfluxDB 2.x. | [javadoc](https://influxdata.github.io/influxdb-client-java/influxdb-client-osgi/apidocs/index.html), [readme](./client-osgi) | 2.x | -| **[karaf](./karaf)** | The Apache Karaf feature definition for the InfluxDB 2.x. | [readme](./karaf) | 2.x | +| Client | Description | Documentation | Compatibility | +|-----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------| +| **[java](./client)** | The reference Java client that allows query, write and InfluxDB 2.x management. | [javadoc](https://influxdata.github.io/influxdb-client-java/influxdb-client-java/apidocs/index.html), [readme](./client#influxdb-client-java/) | 2.x | +| **[reactive](./client-reactive)** | The reference RxJava client for the InfluxDB 2.x that allows query and write in a reactive way. | [javadoc](https://influxdata.github.io/influxdb-client-java/influxdb-client-reactive/apidocs/index.html), [readme](./client-reactive#influxdb-client-reactive/) | 2.x | +| **[kotlin](./client-kotlin)** | The reference Kotlin client that allows query and write for the InfluxDB 2.x by Kotlin [Channel](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.channels/-channel/index.html) and [Flow](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.flow/-flow/index.html) coroutines. | [KDoc](https://influxdata.github.io/influxdb-client-java/influxdb-client-kotlin/dokka/influxdb-client-kotlin/com.influxdb.client.kotlin/index.html), [readme](./client-kotlin#influxdb-client-kotlin/) | 2.x | +| **[scala](./client-scala)** | The reference Scala client that allows query and write for the InfluxDB 2.x by [Pekko Streams](https://pekko.apache.org/docs/pekko/current/stream/index.html). | [Scaladoc](https://influxdata.github.io/influxdb-client-java/client-scala/cross/influxdb-client-scala_2.13/scaladocs/com/influxdb/client/scala/index.html), [readme](./client-scala#influxdb-client-scala/) | 2.x | +| **[osgi](./client-osgi)** | The reference OSGi (R6) client embedding Java and reactive clients and providing standard features (declarative services, configuration, event processing) for the InfluxDB 2.x. | [javadoc](https://influxdata.github.io/influxdb-client-java/influxdb-client-osgi/apidocs/index.html), [readme](./client-osgi) | 2.x | +| **[karaf](./karaf)** | The Apache Karaf feature definition for the InfluxDB 2.x. | [readme](./karaf) | 2.x | There is also possibility to use the Flux language over the InfluxDB 1.7+ provided by: diff --git a/client-core/pom.xml b/client-core/pom.xml index b19e2439326..99844c61900 100644 --- a/client-core/pom.xml +++ b/client-core/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT influxdb-client-core diff --git a/client-kotlin/pom.xml b/client-kotlin/pom.xml index d26342a980d..b25619df4e8 100644 --- a/client-kotlin/pom.xml +++ b/client-kotlin/pom.xml @@ -26,7 +26,7 @@ influxdb-client com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT 4.0.0 diff --git a/client-legacy/pom.xml b/client-legacy/pom.xml index 26b620ef8e8..b69181ff501 100644 --- a/client-legacy/pom.xml +++ b/client-legacy/pom.xml @@ -28,7 +28,7 @@ com.influxdb influxdb-client - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT influxdb-client-flux diff --git a/client-osgi/pom.xml b/client-osgi/pom.xml index b13ac99ee08..bbb4facaafc 100644 --- a/client-osgi/pom.xml +++ b/client-osgi/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT influxdb-client-osgi diff --git a/client-reactive/pom.xml b/client-reactive/pom.xml index aa3acf88009..4959c85b8ab 100644 --- a/client-reactive/pom.xml +++ b/client-reactive/pom.xml @@ -26,7 +26,7 @@ influxdb-client com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT 4.0.0 diff --git a/client-scala/README.md b/client-scala/README.md index df95fa3276e..895a2eb2094 100644 --- a/client-scala/README.md +++ b/client-scala/README.md @@ -2,7 +2,7 @@ [![ScalaDoc](https://img.shields.io/badge/Scaladoc-link-brightgreen.svg)](https://influxdata.github.io/influxdb-client-java/client-scala/cross/influxdb-client-scala_2.13/scaladocs/com/influxdb/client/scala/index.html) -The reference Scala client that allows query and write for the InfluxDB 2.x by [Akka Streams](https://doc.akka.io/docs/akka/2.6/stream/). +The reference Scala client that allows query and write for the InfluxDB 2.x by [Pekko Streams](https://pekko.apache.org/docs/pekko/current/stream/index.html). The client is cross-built against Scala `2.12` and `2.13`. ## Documentation @@ -21,15 +21,15 @@ This section contains links to the client library documentation. ## Queries -The [QueryScalaApi](https://influxdata.github.io/influxdb-client-java/client-scala/cross/influxdb-client-scala_2.13/scaladocs/com/influxdb/client/scala/QueryScalaApi.html) is based on the [Akka Streams](https://doc.akka.io/docs/akka/2.6/stream/). +The [QueryScalaApi](https://influxdata.github.io/influxdb-client-java/client-scala/cross/influxdb-client-scala_2.13/scaladocs/com/influxdb/client/scala/QueryScalaApi.html) is based on the [Pekko Streams](https://pekko.apache.org/docs/pekko/current/stream/index.html). The following example demonstrates querying using the Flux language: ```scala package example -import akka.actor.ActorSystem -import akka.stream.scaladsl.Sink +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.stream.scaladsl.Sink import com.influxdb.client.scala.InfluxDBClientScalaFactory import com.influxdb.query.FluxRecord @@ -77,8 +77,8 @@ It is possible to parse a result line-by-line using the `queryRaw` method: ```scala package example -import akka.actor.ActorSystem -import akka.stream.scaladsl.Sink +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.stream.scaladsl.Sink import com.influxdb.client.scala.InfluxDBClientScalaFactory import scala.concurrent.Await @@ -204,8 +204,8 @@ package example import java.time.temporal.ChronoUnit -import akka.actor.ActorSystem -import akka.stream.scaladsl.Sink +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.stream.scaladsl.Sink import com.influxdb.client.scala.InfluxDBClientScalaFactory import com.influxdb.query.FluxRecord import com.influxdb.query.dsl.Flux diff --git a/client-scala/cross/2.12/pom.xml b/client-scala/cross/2.12/pom.xml index ea7e9da93d5..d5c87cdfe4c 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.13.0-SNAPSHOT + 7.0.0-SNAPSHOT ../../../pom.xml 4.0.0 @@ -36,7 +36,7 @@ The Scala InfluxDB 2.x Client [Scala 2.12] - The reference Scala client that allows query and write for the InfluxDB 2.x by Akka Streams. + The reference Scala client that allows query and write for the InfluxDB 2.x by Pekko Streams. https://github.com/influxdata/influxdb-client-java/tree/master/client-scala @@ -173,9 +173,9 @@ - com.typesafe.akka - akka-stream_2.12 - ${akka.version} + org.apache.pekko + pekko-stream_2.12 + ${pekko.version} com.typesafe @@ -193,9 +193,9 @@ - com.typesafe.akka - akka-testkit_2.12 - ${akka.version} + org.apache.pekko + pekko-testkit_2.12 + ${pekko.version} test @@ -206,9 +206,9 @@ - com.typesafe.akka - akka-stream-testkit_2.12 - ${akka.version} + org.apache.pekko + pekko-stream-testkit_2.12 + ${pekko.version} test diff --git a/client-scala/cross/2.13/pom.xml b/client-scala/cross/2.13/pom.xml index cc039e9615a..3908623cb4a 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.13.0-SNAPSHOT + 7.0.0-SNAPSHOT ../../../pom.xml 4.0.0 @@ -36,7 +36,7 @@ The Scala InfluxDB 2.x Client [Scala 2.13] - The reference Scala client that allows query and write for the InfluxDB 2.x by Akka Streams. + The reference Scala client that allows query and write for the InfluxDB 2.x by Pekko Streams. https://github.com/influxdata/influxdb-client-java/tree/master/client-scala @@ -171,9 +171,9 @@ - com.typesafe.akka - akka-stream_2.13 - ${akka.version} + org.apache.pekko + pekko-stream_2.13 + ${pekko.version} com.typesafe @@ -191,9 +191,9 @@ - com.typesafe.akka - akka-testkit_2.13 - ${akka.version} + org.apache.pekko + pekko-testkit_2.13 + ${pekko.version} test @@ -204,9 +204,9 @@ - com.typesafe.akka - akka-stream-testkit_2.13 - ${akka.version} + org.apache.pekko + pekko-stream-testkit_2.13 + ${pekko.version} test diff --git a/client-scala/src/main/scala/com/influxdb/client/scala/InfluxDBClientScala.scala b/client-scala/src/main/scala/com/influxdb/client/scala/InfluxDBClientScala.scala index b79f04bd447..5193cb033b3 100644 --- a/client-scala/src/main/scala/com/influxdb/client/scala/InfluxDBClientScala.scala +++ b/client-scala/src/main/scala/com/influxdb/client/scala/InfluxDBClientScala.scala @@ -26,7 +26,7 @@ import com.influxdb.client.domain.HealthCheck import javax.annotation.Nonnull /** - * The reference Scala client that allows query and write for the InfluxDB 2.x by Akka Streams. + * The reference Scala client that allows query and write for the InfluxDB 2.x by Pekko Streams. * * @author Jakub Bednar (bednar@github) (08/02/2019 09:09) */ diff --git a/client-scala/src/main/scala/com/influxdb/client/scala/QueryScalaApi.scala b/client-scala/src/main/scala/com/influxdb/client/scala/QueryScalaApi.scala index 5040dacf570..4e1acda34f1 100644 --- a/client-scala/src/main/scala/com/influxdb/client/scala/QueryScalaApi.scala +++ b/client-scala/src/main/scala/com/influxdb/client/scala/QueryScalaApi.scala @@ -21,8 +21,8 @@ */ package com.influxdb.client.scala -import akka.NotUsed -import akka.stream.scaladsl.Source +import org.apache.pekko.NotUsed +import org.apache.pekko.stream.scaladsl.Source import com.influxdb.client.domain.{Dialect, Query} import com.influxdb.query.FluxRecord import javax.annotation.Nonnull diff --git a/client-scala/src/main/scala/com/influxdb/client/scala/WriteScalaApi.scala b/client-scala/src/main/scala/com/influxdb/client/scala/WriteScalaApi.scala index f010d189a13..cb55bfc88df 100644 --- a/client-scala/src/main/scala/com/influxdb/client/scala/WriteScalaApi.scala +++ b/client-scala/src/main/scala/com/influxdb/client/scala/WriteScalaApi.scala @@ -21,8 +21,8 @@ */ package com.influxdb.client.scala -import akka.Done -import akka.stream.scaladsl.Sink +import org.apache.pekko.Done +import org.apache.pekko.stream.scaladsl.Sink import com.influxdb.client.domain.WritePrecision import com.influxdb.client.write.{Point, WriteParameters} diff --git a/client-scala/src/main/scala/com/influxdb/client/scala/internal/QueryScalaApiImpl.scala b/client-scala/src/main/scala/com/influxdb/client/scala/internal/QueryScalaApiImpl.scala index 540f2907b6a..138d155447c 100644 --- a/client-scala/src/main/scala/com/influxdb/client/scala/internal/QueryScalaApiImpl.scala +++ b/client-scala/src/main/scala/com/influxdb/client/scala/internal/QueryScalaApiImpl.scala @@ -21,8 +21,8 @@ */ package com.influxdb.client.scala.internal -import akka.NotUsed -import akka.stream.scaladsl.Source +import org.apache.pekko.NotUsed +import org.apache.pekko.stream.scaladsl.Source import com.influxdb.client.InfluxDBClientOptions import com.influxdb.client.domain.{Dialect, Query} import com.influxdb.client.internal.AbstractInfluxDBClient diff --git a/client-scala/src/main/scala/com/influxdb/client/scala/internal/WriteScalaApiImpl.scala b/client-scala/src/main/scala/com/influxdb/client/scala/internal/WriteScalaApiImpl.scala index 344902b1da9..0b07f83b3eb 100644 --- a/client-scala/src/main/scala/com/influxdb/client/scala/internal/WriteScalaApiImpl.scala +++ b/client-scala/src/main/scala/com/influxdb/client/scala/internal/WriteScalaApiImpl.scala @@ -21,8 +21,8 @@ */ package com.influxdb.client.scala.internal -import akka.Done -import akka.stream.scaladsl.{Flow, Keep, Sink, Source} +import org.apache.pekko.Done +import org.apache.pekko.stream.scaladsl.{Flow, Keep, Sink, Source} import com.influxdb.client.InfluxDBClientOptions import com.influxdb.client.domain.WritePrecision import com.influxdb.client.internal.{AbstractWriteBlockingClient, AbstractWriteClient} diff --git a/client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala b/client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala index ee0fa1ac62a..d1cbf4a3449 100644 --- a/client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala +++ b/client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala @@ -21,10 +21,10 @@ */ package com.influxdb.client.scala -import akka.actor.ActorSystem -import akka.stream.scaladsl.{FileIO, Keep, Source} -import akka.stream.testkit.scaladsl.TestSink -import akka.util.ByteString +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.stream.scaladsl.{FileIO, Keep, Source} +import org.apache.pekko.stream.testkit.scaladsl.TestSink +import org.apache.pekko.util.ByteString import com.influxdb.annotations.Column import com.influxdb.client.domain._ import com.influxdb.client.internal.AbstractInfluxDBClient diff --git a/client-scala/src/test/scala/com/influxdb/client/scala/InfluxDBClientScalaTest.scala b/client-scala/src/test/scala/com/influxdb/client/scala/InfluxDBClientScalaTest.scala index cba7ab5d5af..8f32b90bff0 100644 --- a/client-scala/src/test/scala/com/influxdb/client/scala/InfluxDBClientScalaTest.scala +++ b/client-scala/src/test/scala/com/influxdb/client/scala/InfluxDBClientScalaTest.scala @@ -21,8 +21,8 @@ */ package com.influxdb.client.scala -import akka.actor.ActorSystem -import akka.stream.testkit.scaladsl.TestSink +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.stream.testkit.scaladsl.TestSink import com.influxdb.query.FluxRecord import org.scalatest.BeforeAndAfter import org.scalatest.funsuite.AnyFunSuite diff --git a/client-scala/src/test/scala/com/influxdb/client/scala/WriteScalaApiTest.scala b/client-scala/src/test/scala/com/influxdb/client/scala/WriteScalaApiTest.scala index fdda0bdebcc..4582c6a4dcf 100644 --- a/client-scala/src/test/scala/com/influxdb/client/scala/WriteScalaApiTest.scala +++ b/client-scala/src/test/scala/com/influxdb/client/scala/WriteScalaApiTest.scala @@ -21,8 +21,8 @@ */ package com.influxdb.client.scala -import akka.actor.ActorSystem -import akka.stream.scaladsl.{Keep, Source} +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.stream.scaladsl.{Keep, Source} import com.influxdb.annotations.{Column, Measurement} import com.influxdb.client.domain.WritePrecision import com.influxdb.client.write.{Point, WriteParameters} diff --git a/client-test/pom.xml b/client-test/pom.xml index ecc588f2eb6..7f53e6f77f7 100644 --- a/client-test/pom.xml +++ b/client-test/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT influxdb-client-test diff --git a/client-utils/pom.xml b/client-utils/pom.xml index 67fc2069cbb..d211aeb51e5 100644 --- a/client-utils/pom.xml +++ b/client-utils/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT influxdb-client-utils diff --git a/client/pom.xml b/client/pom.xml index ac3a992262f..2dc9527dcb2 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ influxdb-client com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT 4.0.0 diff --git a/client/src/test/java/com/influxdb/client/WriteApiTest.java b/client/src/test/java/com/influxdb/client/WriteApiTest.java index 59cf9ad3819..853aa7956fe 100644 --- a/client/src/test/java/com/influxdb/client/WriteApiTest.java +++ b/client/src/test/java/com/influxdb/client/WriteApiTest.java @@ -1012,7 +1012,7 @@ void userAgent() throws InterruptedException { String userAgent = recordedRequest.getHeader("User-Agent"); - Assertions.assertThat(userAgent).startsWith("influxdb-client-java/6."); + Assertions.assertThat(userAgent).startsWith("influxdb-client-java/7."); } @Test diff --git a/examples/README.md b/examples/README.md index c6724a74369..b4406a74e0e 100644 --- a/examples/README.md +++ b/examples/README.md @@ -37,5 +37,5 @@ This directory contains Java, Kotlin and Scala examples. - [ScalaQueryRaw.scala](src/main/java/example/ScalaQueryRaw.scala) - How to query data into a stream of `String` - [ScalaQueryDSL.scala](src/main/java/example/ScalaQueryDSL.scala) - How to use the [FluxDSL](../flux-dsl) to query data -### Writes +### Writes - [ScalaWriteApi.scala](src/main/java/example/ScalaWriteApi.scala) - How to ingest data by `DataPoint`, `LineProtocol` or `POJO` diff --git a/examples/pom.xml b/examples/pom.xml index 10580d04670..021c426f517 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -27,12 +27,12 @@ influxdb-client com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT true - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT 4.0.0 diff --git a/examples/src/main/java/example/ScalaQuery.scala b/examples/src/main/java/example/ScalaQuery.scala index 0d5c0648419..f4c50fdfcbf 100644 --- a/examples/src/main/java/example/ScalaQuery.scala +++ b/examples/src/main/java/example/ScalaQuery.scala @@ -21,8 +21,8 @@ */ package example -import akka.actor.ActorSystem -import akka.stream.scaladsl.Sink +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.stream.scaladsl.Sink import com.influxdb.client.scala.InfluxDBClientScalaFactory import com.influxdb.query.FluxRecord diff --git a/examples/src/main/java/example/ScalaQueryDSL.scala b/examples/src/main/java/example/ScalaQueryDSL.scala index 32c82271f5b..9fcbc4758aa 100644 --- a/examples/src/main/java/example/ScalaQueryDSL.scala +++ b/examples/src/main/java/example/ScalaQueryDSL.scala @@ -23,8 +23,8 @@ package example import java.time.temporal.ChronoUnit -import akka.actor.ActorSystem -import akka.stream.scaladsl.Sink +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.stream.scaladsl.Sink import com.influxdb.client.scala.InfluxDBClientScalaFactory import com.influxdb.query.FluxRecord import com.influxdb.query.dsl.Flux diff --git a/examples/src/main/java/example/ScalaQueryRaw.scala b/examples/src/main/java/example/ScalaQueryRaw.scala index 5afd92c32a3..d53c6dc9eef 100644 --- a/examples/src/main/java/example/ScalaQueryRaw.scala +++ b/examples/src/main/java/example/ScalaQueryRaw.scala @@ -21,8 +21,8 @@ */ package example -import akka.actor.ActorSystem -import akka.stream.scaladsl.Sink +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.stream.scaladsl.Sink import com.influxdb.client.scala.InfluxDBClientScalaFactory import scala.concurrent.Await diff --git a/examples/src/main/java/example/ScalaWriteApi.scala b/examples/src/main/java/example/ScalaWriteApi.scala index be800754746..6e507f73926 100644 --- a/examples/src/main/java/example/ScalaWriteApi.scala +++ b/examples/src/main/java/example/ScalaWriteApi.scala @@ -21,8 +21,8 @@ */ package example -import akka.actor.ActorSystem -import akka.stream.scaladsl.{Keep, Source} +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.stream.scaladsl.{Keep, Source} import com.influxdb.annotations.{Column, Measurement} import com.influxdb.client.domain.WritePrecision import com.influxdb.client.scala.InfluxDBClientScalaFactory diff --git a/flux-dsl/pom.xml b/flux-dsl/pom.xml index 82db77baddf..8d675d7dc73 100644 --- a/flux-dsl/pom.xml +++ b/flux-dsl/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT flux-dsl diff --git a/karaf/karaf-assembly/pom.xml b/karaf/karaf-assembly/pom.xml index 04d084280d8..c599a5bf5c5 100644 --- a/karaf/karaf-assembly/pom.xml +++ b/karaf/karaf-assembly/pom.xml @@ -28,7 +28,7 @@ influxdb-karaf com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT influxdb-karaf-assembly diff --git a/karaf/karaf-features/pom.xml b/karaf/karaf-features/pom.xml index 3719262a825..cc98038d234 100644 --- a/karaf/karaf-features/pom.xml +++ b/karaf/karaf-features/pom.xml @@ -28,7 +28,7 @@ influxdb-karaf com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT influxdb-karaf-features diff --git a/karaf/karaf-kar/pom.xml b/karaf/karaf-kar/pom.xml index 732752664ab..4ec1d6705fc 100644 --- a/karaf/karaf-kar/pom.xml +++ b/karaf/karaf-kar/pom.xml @@ -28,7 +28,7 @@ influxdb-karaf com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT influxdb-karaf-kar @@ -82,7 +82,7 @@ ${project.groupId} influxdb-karaf-features - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT features xml diff --git a/karaf/pom.xml b/karaf/pom.xml index 061e7882b98..414e884e25d 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -28,7 +28,7 @@ influxdb-client com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT influxdb-karaf diff --git a/pom.xml b/pom.xml index 102499dfa8b..51fdcf21031 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ com.influxdb influxdb-client - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT pom @@ -121,7 +121,7 @@ 3.12.1 4.8.1 - 2.6.21 + 1.0.2 1.9.22 5.10.1 1.7.3 @@ -538,38 +538,38 @@ com.influxdb influxdb-client-test - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT test com.influxdb influxdb-client-core - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT com.influxdb influxdb-client-utils - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT com.influxdb influxdb-client-java - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT com.influxdb influxdb-client-reactive - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT com.influxdb influxdb-client-flux - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT diff --git a/spring/pom.xml b/spring/pom.xml index 2597a0d8d2c..48192964cf0 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -26,12 +26,12 @@ influxdb-client com.influxdb - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT 4.0.0 influxdb-spring - 6.13.0-SNAPSHOT + 7.0.0-SNAPSHOT jar Spring Integration for InfluxDB 2.x