Skip to content

Commit f1b0e7a

Browse files
bednarbednar
authored
fix: flux-dsl dependencies exclusion (#263)
1 parent 3d771d4 commit f1b0e7a

9 files changed

Lines changed: 140 additions & 32 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
33
### Bug Fixes
44
1. [#258](https://github.com/influxdata/influxdb-client-java/pull/258): Avoid requirements to `jdk.unsupported` module
5+
1. [#263](https://github.com/influxdata/influxdb-client-java/pull/263): Fix dependency structure for `flux-dsl` module
56

67
### Dependencies
78
1. [#258](https://github.com/influxdata/influxdb-client-java/pull/258): Update dependencies:

‎client-core/pom.xml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@
9292

9393
<dependency>
9494
<groupId>com.influxdb</groupId>
95-
<artifactId>influxdb-client-test</artifactId>
96-
<scope>test</scope>
95+
<artifactId>influxdb-client-utils</artifactId>
9796
</dependency>
9897

9998
<dependency>
@@ -116,6 +115,17 @@
116115
<artifactId>commons-csv</artifactId>
117116
</dependency>
118117

118+
<dependency>
119+
<groupId>com.google.code.gson</groupId>
120+
<artifactId>gson</artifactId>
121+
</dependency>
122+
123+
<dependency>
124+
<groupId>com.influxdb</groupId>
125+
<artifactId>influxdb-client-test</artifactId>
126+
<scope>test</scope>
127+
</dependency>
128+
119129
<dependency>
120130
<groupId>com.squareup.okhttp3</groupId>
121131
<artifactId>mockwebserver</artifactId>
@@ -140,12 +150,6 @@
140150
<scope>test</scope>
141151
</dependency>
142152

143-
<dependency>
144-
<groupId>com.google.code.gson</groupId>
145-
<artifactId>gson</artifactId>
146-
</dependency>
147-
148-
149153
</dependencies>
150154

151155
</project>

‎client-utils/pom.xml‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
The MIT License
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in
14+
all copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
THE SOFTWARE.
23+
24+
-->
25+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
26+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
27+
<modelVersion>4.0.0</modelVersion>
28+
29+
<parent>
30+
<artifactId>influxdb-client</artifactId>
31+
<groupId>com.influxdb</groupId>
32+
<version>3.3.0-SNAPSHOT</version>
33+
</parent>
34+
35+
<artifactId>influxdb-client-utils</artifactId>
36+
<packaging>jar</packaging>
37+
38+
<name>The InfluxDB Client Utils</name>
39+
<description>InfluxDB Client Utils - base utils for other modules</description>
40+
41+
<url>https://github.com/influxdata/influxdb-client-java/tree/master/client-utils</url>
42+
43+
<licenses>
44+
<license>
45+
<name>The MIT License (MIT)</name>
46+
<url>https://raw.githubusercontent.com/influxdata/influxdb-client-java/master/LICENSE</url>
47+
<distribution>repo</distribution>
48+
</license>
49+
</licenses>
50+
51+
<developers>
52+
<developer>
53+
<name>Jakub Bednar</name>
54+
<email>[email protected]</email>
55+
<organization>Bonitoo</organization>
56+
<organizationUrl>https://www.bonitoo.io</organizationUrl>
57+
</developer>
58+
<developer>
59+
<name>Robert Hajek</name>
60+
<email>[email protected]</email>
61+
<organization>Bonitoo</organization>
62+
<organizationUrl>https://www.bonitoo.io</organizationUrl>
63+
</developer>
64+
</developers>
65+
66+
<scm>
67+
<connection>scm:git:[email protected]:influxdata/influxdb-client-java.git</connection>
68+
<developerConnection>scm:git:[email protected]:influxdata/influxdb-client-java.git</developerConnection>
69+
<url>http://github.com/influxdata/influxdb-client-java/tree/master</url>
70+
<tag>HEAD</tag>
71+
</scm>
72+
73+
<build>
74+
<plugins>
75+
<plugin>
76+
<groupId>com.mycila</groupId>
77+
<artifactId>license-maven-plugin</artifactId>
78+
<configuration>
79+
<header>../scripts/license_header.txt</header>
80+
</configuration>
81+
</plugin>
82+
<plugin>
83+
<groupId>org.codehaus.mojo</groupId>
84+
<artifactId>versions-maven-plugin</artifactId>
85+
<configuration>
86+
<rulesUri>file://${project.basedir}/../scripts/maven-version-rules.xml</rulesUri>
87+
</configuration>
88+
</plugin>
89+
</plugins>
90+
</build>
91+
92+
<dependencies>
93+
94+
<dependency>
95+
<groupId>org.junit.jupiter</groupId>
96+
<artifactId>junit-jupiter-engine</artifactId>
97+
<scope>test</scope>
98+
</dependency>
99+
100+
<dependency>
101+
<groupId>org.junit.platform</groupId>
102+
<artifactId>junit-platform-runner</artifactId>
103+
<scope>test</scope>
104+
</dependency>
105+
106+
<dependency>
107+
<groupId>org.assertj</groupId>
108+
<artifactId>assertj-core</artifactId>
109+
<scope>test</scope>
110+
</dependency>
111+
112+
</dependencies>
113+
114+
</project>

client-core/src/main/java/com/influxdb/Arguments.java renamed to client-utils/src/main/java/com/influxdb/Arguments.java

File renamed without changes.

client-core/src/test/java/com/influxdb/ArgumentsDurationTest.java renamed to client-utils/src/test/java/com/influxdb/ArgumentsDurationTest.java

File renamed without changes.

client-core/src/test/java/com/influxdb/ArgumentsTest.java renamed to client-utils/src/test/java/com/influxdb/ArgumentsTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ void checkOneCharStringLarge() {
141141

142142
@Test
143143
void checkNotNull() {
144+
Arguments.checkNotNull("value", "property");
145+
}
146+
147+
@Test
148+
void checkNotNullFail() {
144149
Assertions.assertThatThrownBy(() -> Arguments.checkNotNull(null, "property"))
145150
.isInstanceOf(NullPointerException.class)
146151
.hasMessage("Expecting a not null reference for property");

‎client/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,6 @@
132132
<artifactId>okio</artifactId>
133133
</dependency>
134134

135-
<dependency>
136-
<groupId>com.google.code.gson</groupId>
137-
<artifactId>gson</artifactId>
138-
</dependency>
139-
140135
<dependency>
141136
<groupId>io.swagger</groupId>
142137
<artifactId>swagger-annotations</artifactId>

‎flux-dsl/pom.xml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -92,25 +92,7 @@
9292

9393
<dependency>
9494
<groupId>com.influxdb</groupId>
95-
<artifactId>influxdb-client-core</artifactId>
96-
<exclusions>
97-
<exclusion>
98-
<groupId>com.squareup.retrofit2</groupId>
99-
<artifactId>retrofit</artifactId>
100-
</exclusion>
101-
<exclusion>
102-
<groupId>com.squareup.okhttp3</groupId>
103-
<artifactId>logging-interceptor</artifactId>
104-
</exclusion>
105-
<exclusion>
106-
<groupId>org.apache.commons</groupId>
107-
<artifactId>commons-csv</artifactId>
108-
</exclusion>
109-
<exclusion>
110-
<groupId>org.json</groupId>
111-
<artifactId>json</artifactId>
112-
</exclusion>
113-
</exclusions>
95+
<artifactId>influxdb-client-utils</artifactId>
11496
</dependency>
11597

11698
<dependency>

‎pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<packaging>pom</packaging>
3232

3333
<modules>
34+
<module>client-utils</module>
3435
<module>client-test</module>
3536
<module>client-core</module>
3637
<module>client-legacy</module>
@@ -482,6 +483,12 @@
482483
<version>3.3.0-SNAPSHOT</version>
483484
</dependency>
484485

486+
<dependency>
487+
<groupId>com.influxdb</groupId>
488+
<artifactId>influxdb-client-utils</artifactId>
489+
<version>3.3.0-SNAPSHOT</version>
490+
</dependency>
491+
485492
<dependency>
486493
<groupId>com.influxdb</groupId>
487494
<artifactId>influxdb-client-java</artifactId>

0 commit comments

Comments
 (0)