Skip to content

Commit c592324

Browse files
bednarbednar
authored
fix: transient dependency of okhttp, retrofit and rxjava (#297)
1 parent 62c9a1e commit c592324

4 files changed

Lines changed: 40 additions & 7 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
1. [#283](https://github.com/influxdata/influxdb-client-java/pull/283): Serialization `null` tag's value into LineProtocol
88
1. [#285](https://github.com/influxdata/influxdb-client-java/pull/285): Default dialect for Query APIs
99
1. [#294](https://github.com/influxdata/influxdb-client-java/pull/294): Mapping measurement with primitive `float`
10+
1. [#297](https://github.com/influxdata/influxdb-client-java/pull/297): Transient dependency of `okhttp`, `retrofit` and `rxjava`
1011

1112
## 4.0.0 [2021-11-26]
1213

‎client-core/pom.xml‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,41 @@
9696
</dependency>
9797

9898
<dependency>
99-
<groupId>com.squareup.retrofit2</groupId>
100-
<artifactId>retrofit</artifactId>
99+
<groupId>com.squareup.okio</groupId>
100+
<artifactId>okio</artifactId>
101101
</dependency>
102102

103103
<dependency>
104104
<groupId>com.squareup.okhttp3</groupId>
105105
<artifactId>okhttp</artifactId>
106+
<exclusions>
107+
<exclusion>
108+
<groupId>com.squareup.okio</groupId>
109+
<artifactId>okio</artifactId>
110+
</exclusion>
111+
</exclusions>
112+
</dependency>
113+
114+
<dependency>
115+
<groupId>com.squareup.retrofit2</groupId>
116+
<artifactId>retrofit</artifactId>
117+
<exclusions>
118+
<exclusion>
119+
<groupId>com.squareup.okhttp3</groupId>
120+
<artifactId>okhttp</artifactId>
121+
</exclusion>
122+
</exclusions>
106123
</dependency>
107124

108125
<dependency>
109126
<groupId>com.squareup.okhttp3</groupId>
110127
<artifactId>logging-interceptor</artifactId>
128+
<exclusions>
129+
<exclusion>
130+
<groupId>com.squareup.okhttp3</groupId>
131+
<artifactId>okhttp</artifactId>
132+
</exclusion>
133+
</exclusions>
111134
</dependency>
112135

113136
<dependency>

‎client-reactive/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,20 @@
101101
<dependency>
102102
<groupId>com.squareup.retrofit2</groupId>
103103
<artifactId>adapter-rxjava2</artifactId>
104+
<exclusions>
105+
<exclusion>
106+
<groupId>com.squareup.okhttp3</groupId>
107+
<artifactId>okhttp</artifactId>
108+
</exclusion>
109+
<exclusion>
110+
<groupId>com.squareup.retrofit2</groupId>
111+
<artifactId>retrofit</artifactId>
112+
</exclusion>
113+
<exclusion>
114+
<groupId>io.reactivex.rxjava2</groupId>
115+
<artifactId>rxjava</artifactId>
116+
</exclusion>
117+
</exclusions>
104118
</dependency>
105119

106120
<dependency>

‎client/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,6 @@
127127
<artifactId>rxjava</artifactId>
128128
</dependency>
129129

130-
<dependency>
131-
<groupId>com.squareup.okio</groupId>
132-
<artifactId>okio</artifactId>
133-
</dependency>
134-
135130
<dependency>
136131
<groupId>io.swagger</groupId>
137132
<artifactId>swagger-annotations</artifactId>

0 commit comments

Comments
 (0)