Skip to content

Commit 50cdcad

Browse files
authored
Merge pull request #298 from youngsofun/pom
chore: clean up pom.
2 parents fa41ce9 + 1f4cf69 commit 50cdcad

File tree

3 files changed

+5
-58
lines changed

3 files changed

+5
-58
lines changed

databend-client/pom.xml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,10 @@
1414
<version>0.3.4</version>
1515

1616
<properties>
17-
<!--suppress UnresolvedMavenProperty -->
1817
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
1918
<project.build.targetJdk>8</project.build.targetJdk>
20-
<dep.okhttp.version>5.0.0-alpha.11</dep.okhttp.version>
21-
<dep.okio.version>3.1.0</dep.okio.version>
2219
</properties>
2320
<dependencies>
24-
<!-- <dependency>-->
25-
<!-- <groupId>io.airlift</groupId>-->
26-
<!-- <artifactId>units</artifactId>-->
27-
<!-- </dependency>-->
2821
<dependency>
2922
<groupId>com.fasterxml.jackson.core</groupId>
3023
<artifactId>jackson-annotations</artifactId>
@@ -59,38 +52,23 @@
5952
<dependency>
6053
<groupId>com.squareup.okhttp3</groupId>
6154
<artifactId>okhttp</artifactId>
62-
<version>${dep.okhttp.version}</version>
6355
</dependency>
6456
<!-- https://mvnrepository.com/artifact/com.squareup.okio/okio -->
6557
<dependency>
6658
<groupId>com.squareup.okio</groupId>
6759
<artifactId>okio</artifactId>
68-
<version>${dep.okio.version}</version>
6960
</dependency>
7061

71-
7262
<dependency>
7363
<groupId>com.squareup.okhttp3</groupId>
7464
<artifactId>okhttp-tls</artifactId>
75-
<version>${dep.okhttp.version}</version>
7665
</dependency>
7766

7867
<dependency>
7968
<groupId>com.squareup.okhttp3</groupId>
8069
<artifactId>okhttp-urlconnection</artifactId>
81-
<version>${dep.okhttp.version}</version>
8270
</dependency>
8371

84-
<!-- <dependency>-->
85-
<!-- <groupId>com.squareup.okhttp3</groupId>-->
86-
<!-- <artifactId>okhttp-urlconnection</artifactId>-->
87-
<!-- </dependency>-->
88-
89-
<!-- <dependency>-->
90-
<!-- <groupId>net.jodah</groupId>-->
91-
<!-- <artifactId>failsafe</artifactId>-->
92-
<!-- </dependency>-->
93-
9472
<!-- for testing -->
9573

9674
<dependency>
@@ -103,24 +81,5 @@
10381
<artifactId>testng</artifactId>
10482
<scope>test</scope>
10583
</dependency>
106-
<dependency>
107-
<groupId>com.solidfire.code.gson</groupId>
108-
<artifactId>gson</artifactId>
109-
<version>2.6.2</version>
110-
</dependency>
111-
112-
11384
</dependencies>
114-
<build>
115-
<plugins>
116-
<plugin>
117-
<groupId>org.apache.maven.plugins</groupId>
118-
<artifactId>maven-compiler-plugin</artifactId>
119-
<configuration>
120-
<source>16</source>
121-
<target>16</target>
122-
</configuration>
123-
</plugin>
124-
</plugins>
125-
</build>
12685
</project>

databend-jdbc/pom.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@
1414
<version>0.3.4</version>
1515

1616
<properties>
17-
<!--suppress UnresolvedMavenProperty -->
1817
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
1918
<project.build.targetJdk>8</project.build.targetJdk>
20-
<dep.okhttp.version>5.0.0-alpha.11</dep.okhttp.version>
21-
<dep.okio.version>3.1.0</dep.okio.version>
2219
</properties>
2320
<dependencies>
2421
<dependency>
@@ -29,7 +26,6 @@
2926
<dependency>
3027
<groupId>com.squareup.okhttp3</groupId>
3128
<artifactId>okhttp</artifactId>
32-
<version>${dep.okhttp.version}</version>
3329
</dependency>
3430
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
3531
<dependency>
@@ -65,19 +61,15 @@
6561
<dependency>
6662
<groupId>com.squareup.okio</groupId>
6763
<artifactId>okio</artifactId>
68-
<version>${dep.okio.version}</version>
6964
</dependency>
7065

7166
<dependency>
7267
<groupId>com.squareup.okhttp3</groupId>
7368
<artifactId>okhttp-tls</artifactId>
74-
<version>${dep.okhttp.version}</version>
7569
</dependency>
76-
7770
<dependency>
7871
<groupId>com.squareup.okhttp3</groupId>
7972
<artifactId>okhttp-urlconnection</artifactId>
80-
<version>${dep.okhttp.version}</version>
8173
</dependency>
8274
<dependency>
8375
<groupId>joda-time</groupId>
@@ -94,6 +86,8 @@
9486
<version>2.11.1</version>
9587
</dependency>
9688

89+
<!-- for testing -->
90+
9791
<dependency>
9892
<groupId>org.testng</groupId>
9993
<artifactId>testng</artifactId>
@@ -129,7 +123,6 @@
129123
</dependencies>
130124

131125
<build>
132-
133126
<resources>
134127
<resource>
135128
<directory>src/main/resources</directory>

pom.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,12 @@
5252
<dep.errorprone.version>2.15.0</dep.errorprone.version>
5353
<air.javadoc.lint>-missing</air.javadoc.lint>
5454
</properties>
55+
5556
<modules>
5657
<module>databend-client</module>
5758
<module>databend-jdbc</module>
5859
</modules>
60+
5961
<dependencyManagement>
6062
<dependencies>
6163
<dependency>
@@ -91,7 +93,6 @@
9193
<version>${dep.okio.version}</version>
9294
</dependency>
9395

94-
9596
<dependency>
9697
<groupId>com.squareup.okhttp3</groupId>
9798
<artifactId>okhttp-tls</artifactId>
@@ -112,13 +113,7 @@
112113
</dependencies>
113114

114115
</dependencyManagement>
115-
<dependencies>
116-
<dependency>
117-
<groupId>com.solidfire.code.gson</groupId>
118-
<artifactId>gson</artifactId>
119-
<version>2.6.2</version>
120-
</dependency>
121-
</dependencies>
116+
122117
<build>
123118
<plugins>
124119
<plugin>

0 commit comments

Comments
 (0)