Skip to content

Commit 2b3d34a

Browse files
authored
Merge branch 'master' into pekko-support
2 parents 119dc4f + fd604f8 commit 2b3d34a

File tree

4 files changed

+24
-7
lines changed

4 files changed

+24
-7
lines changed

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,23 @@
66
1. [#661](https://github.com/influxdata/influxdb-client-java/pull/661): Replaced Akka Streams with Pekko Streams in the Scala client.
77

88

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+
926
## 6.12.0 [2023-12-15]
1027

1128
### Features

examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<dependency>
118118
<groupId>org.apache.commons</groupId>
119119
<artifactId>commons-lang3</artifactId>
120-
<version>3.13.0</version>
120+
<version>3.14.0</version>
121121
<scope>compile</scope>
122122
</dependency>
123123
<dependency>

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,20 @@
110110

111111
<dependency.retrofit.version>2.9.0</dependency.retrofit.version>
112112
<dependency.okhttp3.version>4.11.0</dependency.okhttp3.version>
113-
<dependency.com.squareup.okio>3.6.0</dependency.com.squareup.okio>
113+
<dependency.com.squareup.okio>3.7.0</dependency.com.squareup.okio>
114114
<dependency.gson.version>2.10.1</dependency.gson.version>
115-
<dependency.io.reactivex.rxjava3>3.1.6</dependency.io.reactivex.rxjava3>
115+
<dependency.io.reactivex.rxjava3>3.1.8</dependency.io.reactivex.rxjava3>
116116

117117
<plugin.surefire.version>3.2.2</plugin.surefire.version>
118-
<plugin.javadoc.version>3.6.0</plugin.javadoc.version>
118+
<plugin.javadoc.version>3.6.3</plugin.javadoc.version>
119119
<plugin.checkstyle.version>3.3.0</plugin.checkstyle.version>
120120
<plugin.jacoco.version>0.8.11</plugin.jacoco.version>
121121
<plugin.site.version>3.12.1</plugin.site.version>
122122
<plugin.scala.version>4.8.1</plugin.scala.version>
123123

124124
<pekko.version>1.0.2</pekko.version>
125-
<kotlin.version>1.9.20</kotlin.version>
126-
<junit-jupiter.version>5.9.1</junit-jupiter.version>
125+
<kotlin.version>1.9.22</kotlin.version>
126+
<junit-jupiter.version>5.10.1</junit-jupiter.version>
127127
<kotlin-coroutines.version>1.7.3</kotlin-coroutines.version>
128128
<mockito.version>4.10.0</mockito.version>
129129
</properties>

spring/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</scm>
7373

7474
<properties>
75-
<micrometer.version>1.11.3</micrometer.version>
75+
<micrometer.version>1.12.1</micrometer.version>
7676
<spring-boot.version>2.7.17</spring-boot.version>
7777
<spring.version>5.3.26</spring.version>
7878
</properties>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy