Skip to content

Commit 9b41ea5

Browse files
utkuaydndependabot[bot]bednar
authored
feat: support for Pekko Streams in the scala client (#661)
* feat: support for Pekko Streams in the scala client BREAKING CHANGE: This client version discontinues support for Akka Streams and introduces support for Pekko Streams instead. * chore(deps): bump org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0 (#669) * chore(deps): bump org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0 Bumps org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * docs: Update CHANGELOG.md --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Bednář <[email protected]> * chore(deps): bump io.micrometer:micrometer-registry-influx from 1.11.3 to 1.12.1 (#670) * chore(deps): bump io.micrometer:micrometer-registry-influx Bumps [io.micrometer:micrometer-registry-influx](https://github.com/micrometer-metrics/micrometer) from 1.11.3 to 1.12.1. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](micrometer-metrics/micrometer@v1.11.3...v1.12.1) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-registry-influx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * docs: Update CHANGELOG.md [skip CI] --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Bednář <[email protected]> * chore(deps): bump io.reactivex.rxjava3:rxjava from 3.1.6 to 3.1.8 (#667) * chore(deps): bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.0 to 3.6.3 (#671) * chore(deps): bump org.apache.maven.plugins:maven-javadoc-plugin Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.0 to 3.6.3. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.6.0...maven-javadoc-plugin-3.6.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * docs: Update CHANGELOG.md --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Bednář <[email protected]> * chore(deps): bump junit-jupiter.version from 5.9.1 to 5.10.1 (#668) * chore(deps): bump junit-jupiter.version from 5.9.1 to 5.10.1 Bumps `junit-jupiter.version` from 5.9.1 to 5.10.1. Updates `org.junit.vintage:junit-vintage-engine` from 5.9.1 to 5.10.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit5@r5.9.1...r5.10.1) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.9.1 to 5.10.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit5@r5.9.1...r5.10.1) Updates `org.junit.jupiter:junit-jupiter-api` from 5.9.1 to 5.10.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit5@r5.9.1...r5.10.1) --- updated-dependencies: - dependency-name: org.junit.vintage:junit-vintage-engine dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * docs: Update CHANGELOG.md --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Bednář <[email protected]> * chore(deps): bump com.squareup.okio:okio from 3.6.0 to 3.7.0 (#666) * chore(deps): bump com.squareup.okio:okio from 3.6.0 to 3.7.0 Bumps [com.squareup.okio:okio](https://github.com/square/okio) from 3.6.0 to 3.7.0. - [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md) - [Commits](square/okio@parent-3.6.0...parent-3.7.0) --- updated-dependencies: - dependency-name: com.squareup.okio:okio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * docs: Update CHANGELOG.md [skip CI] --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Bednář <[email protected]> * chore(deps): bump kotlin.version from 1.9.20 to 1.9.22 (#664) * chore(deps): bump kotlin.version from 1.9.20 to 1.9.22 Bumps `kotlin.version` from 1.9.20 to 1.9.22. Updates `org.jetbrains.kotlin:kotlin-stdlib` from 1.9.20 to 1.9.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v1.9.20...v1.9.22) Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 1.9.20 to 1.9.22 --- 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] <[email protected]> * docs: Update CHANGELOG.md --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Bednář <[email protected]> * chore(deps): bump org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0 (#669) * chore(deps): bump org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0 Bumps org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * docs: Update CHANGELOG.md --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Bednář <[email protected]> * chore(deps): bump junit-jupiter.version from 5.9.1 to 5.10.1 (#668) * chore(deps): bump junit-jupiter.version from 5.9.1 to 5.10.1 Bumps `junit-jupiter.version` from 5.9.1 to 5.10.1. Updates `org.junit.vintage:junit-vintage-engine` from 5.9.1 to 5.10.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit5@r5.9.1...r5.10.1) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.9.1 to 5.10.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit5@r5.9.1...r5.10.1) Updates `org.junit.jupiter:junit-jupiter-api` from 5.9.1 to 5.10.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit5@r5.9.1...r5.10.1) --- updated-dependencies: - dependency-name: org.junit.vintage:junit-vintage-engine dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * docs: Update CHANGELOG.md --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Bednář <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Bednář <[email protected]>
1 parent fd604f8 commit 9b41ea5

File tree

35 files changed

+125
-92
lines changed

35 files changed

+125
-92
lines changed

‎CHANGELOG.md

+34-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,37 @@
1-
## 6.13.0 [unreleased]
1+
## 7.0.0 [unreleased]
2+
3+
: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.
4+
5+
### Features
6+
1. [#661](https://github.com/influxdata/influxdb-client-java/pull/661): Replaced Akka Streams with Pekko Streams in the Scala client.
7+
8+
9+
### Dependencies
10+
11+
Update dependencies:
12+
13+
#### Build:
14+
- [#664](https://github.com/influxdata/influxdb-client-java/pull/664): `kotlin` to `1.9.22`
15+
- [#666](https://github.com/influxdata/influxdb-client-java/pull/666): `okio` to `3.7.0`
16+
- [#667](https://github.com/influxdata/influxdb-client-java/pull/667): `rxjava` to `3.1.8`
17+
- [#669](https://github.com/influxdata/influxdb-client-java/pull/669): `commons-lang3` to `3.14.0`
18+
- [#670](https://github.com/influxdata/influxdb-client-java/pull/670): `micrometer-registry-influx` to `1.12.1`
19+
20+
#### Maven:
21+
- [#671](https://github.com/influxdata/influxdb-client-java/pull/671): `maven-javadoc-plugin` to `3.6.3`
22+
23+
#### Test:
24+
- [#668](https://github.com/influxdata/influxdb-client-java/pull/668): `junit-jupiter` to `5.10.1`
25+
26+
### Dependencies
27+
28+
Update dependencies:
29+
30+
#### Build:
31+
- [#669](https://github.com/influxdata/influxdb-client-java/pull/669): `commons-lang3` to `3.14.0`
32+
33+
#### Test:
34+
- [#668](https://github.com/influxdata/influxdb-client-java/pull/668): `junit-jupiter` to `5.10.1`
235

336
### Dependencies
437

‎README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ This section contains links to the client library documentation.
5353

5454
The Java, Reactive, OSGi, Kotlin and Scala clients are implemented for the InfluxDB 2.x:
5555

56-
| Client | Description | Documentation | Compatibility |
57-
| --- | --- | --- | --- |
58-
| **[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 |
59-
| **[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 |
60-
| **[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|
61-
| **[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 |
62-
| **[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 |
63-
| **[karaf](./karaf)** | The Apache Karaf feature definition for the InfluxDB 2.x. | [readme](./karaf) | 2.x |
56+
| Client | Description | Documentation | Compatibility |
57+
|-----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
58+
| **[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 |
59+
| **[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 |
60+
| **[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 |
61+
| **[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 |
62+
| **[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 |
63+
| **[karaf](./karaf)** | The Apache Karaf feature definition for the InfluxDB 2.x. | [readme](./karaf) | 2.x |
6464

6565
There is also possibility to use the Flux language over the InfluxDB 1.7+ provided by:
6666

‎client-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>influxdb-client</artifactId>
3030
<groupId>com.influxdb</groupId>
31-
<version>6.13.0-SNAPSHOT</version>
31+
<version>7.0.0-SNAPSHOT</version>
3232
</parent>
3333

3434
<artifactId>influxdb-client-core</artifactId>

‎client-kotlin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<artifactId>influxdb-client</artifactId>
2828
<groupId>com.influxdb</groupId>
29-
<version>6.13.0-SNAPSHOT</version>
29+
<version>7.0.0-SNAPSHOT</version>
3030
</parent>
3131
<modelVersion>4.0.0</modelVersion>
3232

‎client-legacy/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>com.influxdb</groupId>
3030
<artifactId>influxdb-client</artifactId>
31-
<version>6.13.0-SNAPSHOT</version>
31+
<version>7.0.0-SNAPSHOT</version>
3232
</parent>
3333

3434
<artifactId>influxdb-client-flux</artifactId>

‎client-osgi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>influxdb-client</artifactId>
3030
<groupId>com.influxdb</groupId>
31-
<version>6.13.0-SNAPSHOT</version>
31+
<version>7.0.0-SNAPSHOT</version>
3232
</parent>
3333

3434
<artifactId>influxdb-client-osgi</artifactId>

‎client-reactive/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<artifactId>influxdb-client</artifactId>
2828
<groupId>com.influxdb</groupId>
29-
<version>6.13.0-SNAPSHOT</version>
29+
<version>7.0.0-SNAPSHOT</version>
3030
</parent>
3131
<modelVersion>4.0.0</modelVersion>
3232

‎client-scala/README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![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)
44

5-
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/).
5+
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).
66
The client is cross-built against Scala `2.12` and `2.13`.
77

88
## Documentation
@@ -21,15 +21,15 @@ This section contains links to the client library documentation.
2121

2222
## Queries
2323

24-
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/).
24+
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).
2525

2626
The following example demonstrates querying using the Flux language:
2727

2828
```scala
2929
package example
3030

31-
import akka.actor.ActorSystem
32-
import akka.stream.scaladsl.Sink
31+
import org.apache.pekko.actor.ActorSystem
32+
import org.apache.pekko.stream.scaladsl.Sink
3333
import com.influxdb.client.scala.InfluxDBClientScalaFactory
3434
import com.influxdb.query.FluxRecord
3535

@@ -77,8 +77,8 @@ It is possible to parse a result line-by-line using the `queryRaw` method:
7777
```scala
7878
package example
7979

80-
import akka.actor.ActorSystem
81-
import akka.stream.scaladsl.Sink
80+
import org.apache.pekko.actor.ActorSystem
81+
import org.apache.pekko.stream.scaladsl.Sink
8282
import com.influxdb.client.scala.InfluxDBClientScalaFactory
8383

8484
import scala.concurrent.Await
@@ -204,8 +204,8 @@ package example
204204

205205
import java.time.temporal.ChronoUnit
206206

207-
import akka.actor.ActorSystem
208-
import akka.stream.scaladsl.Sink
207+
import org.apache.pekko.actor.ActorSystem
208+
import org.apache.pekko.stream.scaladsl.Sink
209209
import com.influxdb.client.scala.InfluxDBClientScalaFactory
210210
import com.influxdb.query.FluxRecord
211211
import com.influxdb.query.dsl.Flux

‎client-scala/cross/2.12/pom.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<artifactId>influxdb-client</artifactId>
2828
<groupId>com.influxdb</groupId>
29-
<version>6.13.0-SNAPSHOT</version>
29+
<version>7.0.0-SNAPSHOT</version>
3030
<relativePath>../../../pom.xml</relativePath>
3131
</parent>
3232
<modelVersion>4.0.0</modelVersion>
@@ -36,7 +36,7 @@
3636

3737
<name>The Scala InfluxDB 2.x Client [Scala 2.12]</name>
3838
<description>
39-
The reference Scala client that allows query and write for the InfluxDB 2.x by Akka Streams.
39+
The reference Scala client that allows query and write for the InfluxDB 2.x by Pekko Streams.
4040
</description>
4141

4242
<url>https://github.com/influxdata/influxdb-client-java/tree/master/client-scala</url>
@@ -173,9 +173,9 @@
173173
</dependency>
174174

175175
<dependency>
176-
<groupId>com.typesafe.akka</groupId>
177-
<artifactId>akka-stream_2.12</artifactId>
178-
<version>${akka.version}</version>
176+
<groupId>org.apache.pekko</groupId>
177+
<artifactId>pekko-stream_2.12</artifactId>
178+
<version>${pekko.version}</version>
179179
<exclusions>
180180
<exclusion>
181181
<groupId>com.typesafe</groupId>
@@ -193,9 +193,9 @@
193193
</dependency>
194194

195195
<dependency>
196-
<groupId>com.typesafe.akka</groupId>
197-
<artifactId>akka-testkit_2.12</artifactId>
198-
<version>${akka.version}</version>
196+
<groupId>org.apache.pekko</groupId>
197+
<artifactId>pekko-testkit_2.12</artifactId>
198+
<version>${pekko.version}</version>
199199
<scope>test</scope>
200200
<exclusions>
201201
<exclusion>
@@ -206,9 +206,9 @@
206206
</dependency>
207207

208208
<dependency>
209-
<groupId>com.typesafe.akka</groupId>
210-
<artifactId>akka-stream-testkit_2.12</artifactId>
211-
<version>${akka.version}</version>
209+
<groupId>org.apache.pekko</groupId>
210+
<artifactId>pekko-stream-testkit_2.12</artifactId>
211+
<version>${pekko.version}</version>
212212
<scope>test</scope>
213213
<exclusions>
214214
<exclusion>

‎client-scala/cross/2.13/pom.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<artifactId>influxdb-client</artifactId>
2828
<groupId>com.influxdb</groupId>
29-
<version>6.13.0-SNAPSHOT</version>
29+
<version>7.0.0-SNAPSHOT</version>
3030
<relativePath>../../../pom.xml</relativePath>
3131
</parent>
3232
<modelVersion>4.0.0</modelVersion>
@@ -36,7 +36,7 @@
3636

3737
<name>The Scala InfluxDB 2.x Client [Scala 2.13]</name>
3838
<description>
39-
The reference Scala client that allows query and write for the InfluxDB 2.x by Akka Streams.
39+
The reference Scala client that allows query and write for the InfluxDB 2.x by Pekko Streams.
4040
</description>
4141

4242
<url>https://github.com/influxdata/influxdb-client-java/tree/master/client-scala</url>
@@ -171,9 +171,9 @@
171171
</dependency>
172172

173173
<dependency>
174-
<groupId>com.typesafe.akka</groupId>
175-
<artifactId>akka-stream_2.13</artifactId>
176-
<version>${akka.version}</version>
174+
<groupId>org.apache.pekko</groupId>
175+
<artifactId>pekko-stream_2.13</artifactId>
176+
<version>${pekko.version}</version>
177177
<exclusions>
178178
<exclusion>
179179
<groupId>com.typesafe</groupId>
@@ -191,9 +191,9 @@
191191
</dependency>
192192

193193
<dependency>
194-
<groupId>com.typesafe.akka</groupId>
195-
<artifactId>akka-testkit_2.13</artifactId>
196-
<version>${akka.version}</version>
194+
<groupId>org.apache.pekko</groupId>
195+
<artifactId>pekko-testkit_2.13</artifactId>
196+
<version>${pekko.version}</version>
197197
<scope>test</scope>
198198
<exclusions>
199199
<exclusion>
@@ -204,9 +204,9 @@
204204
</dependency>
205205

206206
<dependency>
207-
<groupId>com.typesafe.akka</groupId>
208-
<artifactId>akka-stream-testkit_2.13</artifactId>
209-
<version>${akka.version}</version>
207+
<groupId>org.apache.pekko</groupId>
208+
<artifactId>pekko-stream-testkit_2.13</artifactId>
209+
<version>${pekko.version}</version>
210210
<scope>test</scope>
211211
<exclusions>
212212
<exclusion>

‎client-scala/src/main/scala/com/influxdb/client/scala/InfluxDBClientScala.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import com.influxdb.client.domain.HealthCheck
2626
import javax.annotation.Nonnull
2727

2828
/**
29-
* The reference Scala client that allows query and write for the InfluxDB 2.x by Akka Streams.
29+
* The reference Scala client that allows query and write for the InfluxDB 2.x by Pekko Streams.
3030
*
3131
* @author Jakub Bednar (bednar@github) (08/02/2019 09:09)
3232
*/

‎client-scala/src/main/scala/com/influxdb/client/scala/QueryScalaApi.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*/
2222
package com.influxdb.client.scala
2323

24-
import akka.NotUsed
25-
import akka.stream.scaladsl.Source
24+
import org.apache.pekko.NotUsed
25+
import org.apache.pekko.stream.scaladsl.Source
2626
import com.influxdb.client.domain.{Dialect, Query}
2727
import com.influxdb.query.FluxRecord
2828
import javax.annotation.Nonnull

‎client-scala/src/main/scala/com/influxdb/client/scala/WriteScalaApi.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*/
2222
package com.influxdb.client.scala
2323

24-
import akka.Done
25-
import akka.stream.scaladsl.Sink
24+
import org.apache.pekko.Done
25+
import org.apache.pekko.stream.scaladsl.Sink
2626
import com.influxdb.client.domain.WritePrecision
2727
import com.influxdb.client.write.{Point, WriteParameters}
2828

‎client-scala/src/main/scala/com/influxdb/client/scala/internal/QueryScalaApiImpl.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*/
2222
package com.influxdb.client.scala.internal
2323

24-
import akka.NotUsed
25-
import akka.stream.scaladsl.Source
24+
import org.apache.pekko.NotUsed
25+
import org.apache.pekko.stream.scaladsl.Source
2626
import com.influxdb.client.InfluxDBClientOptions
2727
import com.influxdb.client.domain.{Dialect, Query}
2828
import com.influxdb.client.internal.AbstractInfluxDBClient

‎client-scala/src/main/scala/com/influxdb/client/scala/internal/WriteScalaApiImpl.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*/
2222
package com.influxdb.client.scala.internal
2323

24-
import akka.Done
25-
import akka.stream.scaladsl.{Flow, Keep, Sink, Source}
24+
import org.apache.pekko.Done
25+
import org.apache.pekko.stream.scaladsl.{Flow, Keep, Sink, Source}
2626
import com.influxdb.client.InfluxDBClientOptions
2727
import com.influxdb.client.domain.WritePrecision
2828
import com.influxdb.client.internal.{AbstractWriteBlockingClient, AbstractWriteClient}

‎client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
*/
2222
package com.influxdb.client.scala
2323

24-
import akka.actor.ActorSystem
25-
import akka.stream.scaladsl.{FileIO, Keep, Source}
26-
import akka.stream.testkit.scaladsl.TestSink
27-
import akka.util.ByteString
24+
import org.apache.pekko.actor.ActorSystem
25+
import org.apache.pekko.stream.scaladsl.{FileIO, Keep, Source}
26+
import org.apache.pekko.stream.testkit.scaladsl.TestSink
27+
import org.apache.pekko.util.ByteString
2828
import com.influxdb.annotations.Column
2929
import com.influxdb.client.domain._
3030
import com.influxdb.client.internal.AbstractInfluxDBClient

‎client-scala/src/test/scala/com/influxdb/client/scala/InfluxDBClientScalaTest.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*/
2222
package com.influxdb.client.scala
2323

24-
import akka.actor.ActorSystem
25-
import akka.stream.testkit.scaladsl.TestSink
24+
import org.apache.pekko.actor.ActorSystem
25+
import org.apache.pekko.stream.testkit.scaladsl.TestSink
2626
import com.influxdb.query.FluxRecord
2727
import org.scalatest.BeforeAndAfter
2828
import org.scalatest.funsuite.AnyFunSuite

‎client-scala/src/test/scala/com/influxdb/client/scala/WriteScalaApiTest.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*/
2222
package com.influxdb.client.scala
2323

24-
import akka.actor.ActorSystem
25-
import akka.stream.scaladsl.{Keep, Source}
24+
import org.apache.pekko.actor.ActorSystem
25+
import org.apache.pekko.stream.scaladsl.{Keep, Source}
2626
import com.influxdb.annotations.{Column, Measurement}
2727
import com.influxdb.client.domain.WritePrecision
2828
import com.influxdb.client.write.{Point, WriteParameters}

‎client-test/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>influxdb-client</artifactId>
3030
<groupId>com.influxdb</groupId>
31-
<version>6.13.0-SNAPSHOT</version>
31+
<version>7.0.0-SNAPSHOT</version>
3232
</parent>
3333

3434
<artifactId>influxdb-client-test</artifactId>

‎client-utils/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<artifactId>influxdb-client</artifactId>
3030
<groupId>com.influxdb</groupId>
31-
<version>6.13.0-SNAPSHOT</version>
31+
<version>7.0.0-SNAPSHOT</version>
3232
</parent>
3333

3434
<artifactId>influxdb-client-utils</artifactId>

‎client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<artifactId>influxdb-client</artifactId>
2828
<groupId>com.influxdb</groupId>
29-
<version>6.13.0-SNAPSHOT</version>
29+
<version>7.0.0-SNAPSHOT</version>
3030
</parent>
3131
<modelVersion>4.0.0</modelVersion>
3232

0 commit comments

Comments
 (0)