From 39a22983f76da3d7dcbedd0e871292f1392b841e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Oct 2023 10:44:42 +0000
Subject: [PATCH 1/2] chore(deps): bump dependency.okhttp3.version from 4.10.0
 to 4.11.0

Bumps `dependency.okhttp3.version` from 4.10.0 to 4.11.0.

Updates `okhttp` from 4.10.0 to 4.11.0
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.10.0...parent-4.11.0)

Updates `logging-interceptor` from 4.10.0 to 4.11.0
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.10.0...parent-4.11.0)

Updates `mockwebserver` from 4.10.0 to 4.11.0
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.10.0...parent-4.11.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.squareup.okhttp3:logging-interceptor
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.squareup.okhttp3:mockwebserver
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 67a98d4e8a..c724d9f7a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <dependency.retrofit.version>2.9.0</dependency.retrofit.version>
-        <dependency.okhttp3.version>4.10.0</dependency.okhttp3.version>
+        <dependency.okhttp3.version>4.11.0</dependency.okhttp3.version>
         <dependency.com.squareup.okio>3.4.0</dependency.com.squareup.okio>
         <dependency.gson.version>2.10.1</dependency.gson.version>
         <dependency.io.reactivex.rxjava3>3.1.6</dependency.io.reactivex.rxjava3>

From 7ea2ac7e6a9052e4b4fd615d4c9b00f5a42fa2e9 Mon Sep 17 00:00:00 2001
From: Jakub Bednar <jakub.bednar@gmail.com>
Date: Fri, 6 Oct 2023 13:01:30 +0200
Subject: [PATCH 2/2] fix: inconsistent dependency

---
 CHANGELOG.md        |  2 ++
 client-core/pom.xml | 10 +++++++---
 client-test/pom.xml |  6 +++++-
 pom.xml             |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a0549a70c..0590ece2c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ Update dependencies:
  - [#625](https://github.com/influxdata/influxdb-client-java/pull/625): `lombok` to `1.18.30`
  - [#629](https://github.com/influxdata/influxdb-client-java/pull/629): `karaf` to `4.4.4`
  - [#617](https://github.com/influxdata/influxdb-client-java/pull/617): `kotlin` to `1.9.10`
+ - [#542](https://github.com/influxdata/influxdb-client-java/pull/542): `okhttp` to `4.11.0`
+ - [#542](https://github.com/influxdata/influxdb-client-java/pull/542): `okio` to `3.5.0`
 
 #### Maven:
  - [#618](https://github.com/influxdata/influxdb-client-java/pull/618): `maven-enforcer-plugin` to `3.4.0`
diff --git a/client-core/pom.xml b/client-core/pom.xml
index be6a33ac42..91e03484dc 100644
--- a/client-core/pom.xml
+++ b/client-core/pom.xml
@@ -24,7 +24,7 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <artifactId>influxdb-client</artifactId>
         <groupId>com.influxdb</groupId>
@@ -68,7 +68,7 @@
         <url>https://github.com/influxdata/influxdb-client-java/tree/master</url>
       <tag>HEAD</tag>
   </scm>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -107,6 +107,10 @@
                     <groupId>org.jetbrains.kotlin</groupId>
                     <artifactId>kotlin-stdlib-common</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-jdk8</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -197,4 +201,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/client-test/pom.xml b/client-test/pom.xml
index 0314c119f3..e24c76fd45 100644
--- a/client-test/pom.xml
+++ b/client-test/pom.xml
@@ -125,6 +125,10 @@
                     <groupId>org.jetbrains.kotlin</groupId>
                     <artifactId>kotlin-stdlib-common</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-jdk8</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -155,4 +159,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index c724d9f7a6..385bbd5f15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
 
         <dependency.retrofit.version>2.9.0</dependency.retrofit.version>
         <dependency.okhttp3.version>4.11.0</dependency.okhttp3.version>
-        <dependency.com.squareup.okio>3.4.0</dependency.com.squareup.okio>
+        <dependency.com.squareup.okio>3.5.0</dependency.com.squareup.okio>
         <dependency.gson.version>2.10.1</dependency.gson.version>
         <dependency.io.reactivex.rxjava3>3.1.6</dependency.io.reactivex.rxjava3>