Skip to content

Commit cf11d30

Browse files
linghengqianlinghengqian
committed
Bump base HiveServer2 JDBC Driver version to 4.0.1
1 parent 00de0c5 commit cf11d30

File tree

13 files changed

+268
-480
lines changed

13 files changed

+268
-480
lines changed

‎.github/workflows/test.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
if: github.repository == 'linghengqian/hive-server2-jdbc-driver'
3333
strategy:
3434
matrix:
35-
java: [ '8' ]
35+
java: [ '8', '23' ]
3636
os: [ 'ubuntu-latest' ]
3737
runs-on: ${{ matrix.os }}
3838
steps:
@@ -43,13 +43,14 @@ jobs:
4343
java-version: ${{ matrix.java }}
4444
cache: 'maven'
4545
- run: |
46-
mvn -T 1.5C clean test
46+
mvn wrapper:wrapper -Dmaven=3.9.9
47+
./mvnw -T 1.5C clean test
4748
native-test-ci:
4849
name: NativeTest - GraalVM CE for JDK ${{ matrix.java }} on ${{ matrix.os }}
4950
if: github.repository == 'linghengqian/hive-server2-jdbc-driver'
5051
strategy:
5152
matrix:
52-
java: [ '22.0.2' ]
53+
java: [ '22.0.2', '23' ]
5354
os: [ 'ubuntu-latest' ]
5455
runs-on: ${{ matrix.os }}
5556
steps:

‎.licenserc.yaml

-18
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,6 @@ dependency:
3131
files:
3232
- pom.xml
3333
licenses:
34-
- name: org.apache.hadoop.thirdparty:hadoop-shaded-guava
35-
version: 1.1.1
36-
license: Apache-2.0
37-
- name: org.apache.zookeeper:zookeeper
38-
version: 3.6.3,3.8.3
39-
license: Apache-2.0
40-
- name: com.google.guava:failureaccess
41-
version: "1.0"
42-
license: Apache-2.0
43-
- name: com.google.guava:listenablefuture
44-
version: 9999.0-empty-to-avoid-conflict-with-guava
45-
license: Apache-2.0
46-
- name: org.apache.zookeeper:zookeeper-jute
47-
version: 3.6.3,3.8.3
48-
license: Apache-2.0
4934
- name: org.slf4j:slf4j-api
5035
version: 1.7.30
5136
license: MIT
52-
- name: org.codehaus.woodstox:stax2-api
53-
version: 4.2.1
54-
license: BSD-2-Clause

‎LICENSE

+202-201
Large diffs are not rendered by default.

‎NOTICE

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.
55
You may obtain a copy of the License at
66

7-
http://www.apache.org/licenses/LICENSE-2.0
7+
http://www.apache.org/licenses/LICENSE-2.0
88

99
Unless required by applicable law or agreed to in writing, software
1010
distributed under the License is distributed on an "AS IS" BASIS,

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Third-party builds of the HiveServer2 JDBC Driver
22

33
The purpose of the current project is to create a `Thin JAR` of HiveServer2 JDBC Driver.
4-
All release products have been verified and usable in the GraalVM Native Image compiled by GraalVM CE For JDK 22.0.2.
4+
All release products have been verified and usable in the GraalVM Native Image compiled by GraalVM CE For JDK 22.0.2 and GraalVM CE For JDK 23.
55

66
The steps to use directly in Maven are as follows.
77
The latest version is available

‎doc/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## v1
44

5+
### 1.5.0
6+
7+
1. Bump base HiveServer2 JDBC Driver version to `4.0.1`.
8+
2. Support for Thin JAR and Uber JAR of HiveServer2 JDBC Driver under OpenJDK 23.
9+
3. Supports using Thin JAR and Uber JAR of HiveServer2 JDBC Driver in GraalVM Native Image compiled by GraalVM CE For JDK23.
10+
11+
Build from `apache/hive:rel/release-4.0.1`.
12+
513
### 1.4.0
614

715
Updates Apache-2.0 license header.

‎doc/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Then execute the following command.
8080
Suppose the release to be released is `1.1.0`, and the next version is `1.2.0-SNAPSHOT`.
8181

8282
```shell
83-
sdk use java 8.0.422-tem
83+
sdk use java 22.0.2-graalce
8484
git clone [email protected]:linghengqian/hive-server2-jdbc-driver.git
8585
cd ./hive-server2-jdbc-driver/
8686
./mvnw versions:set -DgenerateBackupPoms=false -DnewVersion=1.1.0

‎hive-server2-jdbc-driver-thin/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,6 @@
707707
<plugin>
708708
<groupId>org.graalvm.buildtools</groupId>
709709
<artifactId>native-maven-plugin</artifactId>
710-
<version>${native-maven-plugin.version}</version>
711710
</plugin>
712711
</plugins>
713712
</build>

‎hive-server2-jdbc-driver-thin/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/thin/HiveServer2ThinTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
public class HiveServer2ThinTest {
4141

4242
@Container
43-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.0"))
43+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
4444
.withEnv("SERVICE_NAME", "hiveserver2")
4545
.withExposedPorts(10000, 10002);
4646

‎hive-server2-jdbc-driver-uber/pom.xml

-249
Original file line numberDiff line numberDiff line change
@@ -34,262 +34,13 @@
3434
<version>${apache-hive-jdbc.version}</version>
3535
<classifier>standalone</classifier>
3636
</dependency>
37-
<dependency>
38-
<groupId>org.apache.hadoop</groupId>
39-
<artifactId>hadoop-common</artifactId>
40-
<version>${hadoop.version}</version>
41-
<exclusions>
42-
<exclusion>
43-
<groupId>ch.qos.reload4j</groupId>
44-
<artifactId>*</artifactId>
45-
</exclusion>
46-
<exclusion>
47-
<groupId>com.fasterxml.jackson.core</groupId>
48-
<artifactId>*</artifactId>
49-
</exclusion>
50-
<exclusion>
51-
<groupId>com.google.code.gson</groupId>
52-
<artifactId>*</artifactId>
53-
</exclusion>
54-
<exclusion>
55-
<groupId>com.google.re2j</groupId>
56-
<artifactId>*</artifactId>
57-
</exclusion>
58-
<exclusion>
59-
<groupId>com.jcraft</groupId>
60-
<artifactId>*</artifactId>
61-
</exclusion>
62-
<exclusion>
63-
<groupId>commons-beanutils</groupId>
64-
<artifactId>*</artifactId>
65-
</exclusion>
66-
<exclusion>
67-
<groupId>commons-cli</groupId>
68-
<artifactId>*</artifactId>
69-
</exclusion>
70-
<exclusion>
71-
<groupId>commons-io</groupId>
72-
<artifactId>*</artifactId>
73-
</exclusion>
74-
<exclusion>
75-
<groupId>commons-net</groupId>
76-
<artifactId>*</artifactId>
77-
</exclusion>
78-
<exclusion>
79-
<groupId>com.google.code.findbugs</groupId>
80-
<artifactId>*</artifactId>
81-
</exclusion>
82-
<exclusion>
83-
<groupId>com.google.protobuf</groupId>
84-
<artifactId>*</artifactId>
85-
</exclusion>
86-
<exclusion>
87-
<groupId>com.github.pjfanning</groupId>
88-
<artifactId>*</artifactId>
89-
</exclusion>
90-
<exclusion>
91-
<groupId>com.sun.jersey</groupId>
92-
<artifactId>*</artifactId>
93-
</exclusion>
94-
<exclusion>
95-
<groupId>com.thoughtworks.paranamer</groupId>
96-
<artifactId>*</artifactId>
97-
</exclusion>
98-
<exclusion>
99-
<groupId>dnsjava</groupId>
100-
<artifactId>*</artifactId>
101-
</exclusion>
102-
<exclusion>
103-
<groupId>io.dropwizard.metrics</groupId>
104-
<artifactId>*</artifactId>
105-
</exclusion>
106-
<exclusion>
107-
<groupId>javax.servlet</groupId>
108-
<artifactId>*</artifactId>
109-
</exclusion>
110-
<exclusion>
111-
<groupId>javax.servlet.jsp</groupId>
112-
<artifactId>*</artifactId>
113-
</exclusion>
114-
<exclusion>
115-
<groupId>org.apache.avro</groupId>
116-
<artifactId>*</artifactId>
117-
</exclusion>
118-
<exclusion>
119-
<groupId>org.apache.commons</groupId>
120-
<artifactId>commons-compress</artifactId>
121-
</exclusion>
122-
<exclusion>
123-
<groupId>org.apache.commons</groupId>
124-
<artifactId>commons-math3</artifactId>
125-
</exclusion>
126-
<exclusion>
127-
<groupId>org.apache.hadoop</groupId>
128-
<artifactId>hadoop-annotations</artifactId>
129-
</exclusion>
130-
<exclusion>
131-
<groupId>org.apache.hadoop.thirdparty</groupId>
132-
<artifactId>hadoop-shaded-protobuf_3_7</artifactId>
133-
</exclusion>
134-
<exclusion>
135-
<groupId>org.apache.kerby</groupId>
136-
<artifactId>*</artifactId>
137-
</exclusion>
138-
<exclusion>
139-
<groupId>org.eclipse.jetty</groupId>
140-
<artifactId>*</artifactId>
141-
</exclusion>
142-
<exclusion>
143-
<groupId>org.slf4j</groupId>
144-
<artifactId>slf4j-reload4j</artifactId>
145-
</exclusion>
146-
<exclusion>
147-
<groupId>org.xerial.snappy</groupId>
148-
<artifactId>*</artifactId>
149-
</exclusion>
150-
<!--
151-
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
152-
This exclusion can be removed once we update to `apache/hive:4.1.0`.
153-
-->
154-
<exclusion>
155-
<groupId>org.slf4j</groupId>
156-
<artifactId>slf4j-log4j12</artifactId>
157-
</exclusion>
158-
<!--
159-
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
160-
This exclusion can be removed once we update to `apache/hive:4.1.0`.
161-
-->
162-
<exclusion>
163-
<groupId>commons-codec</groupId>
164-
<artifactId>commons-codec</artifactId>
165-
</exclusion>
166-
<!--
167-
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
168-
This exclusion can be removed once we update to `apache/hive:4.1.0`.
169-
-->
170-
<exclusion>
171-
<groupId>commons-logging</groupId>
172-
<artifactId>commons-logging</artifactId>
173-
</exclusion>
174-
<!--
175-
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
176-
This exclusion can be removed once we update to `apache/hive:4.1.0`.
177-
-->
178-
<exclusion>
179-
<groupId>org.apache.commons</groupId>
180-
<artifactId>commons-text</artifactId>
181-
</exclusion>
182-
<!--
183-
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
184-
This exclusion can be removed once we update to `apache/hive:4.1.0`.
185-
-->
186-
<exclusion>
187-
<groupId>org.codehaus.woodstox</groupId>
188-
<artifactId>stax2-api</artifactId>
189-
</exclusion>
190-
<!--
191-
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
192-
This exclusion can be removed once we update to `apache/hive:4.1.0`.
193-
-->
194-
<exclusion>
195-
<groupId>org.slf4j</groupId>
196-
<artifactId>slf4j-api</artifactId>
197-
</exclusion>
198-
</exclusions>
199-
</dependency>
200-
<dependency>
201-
<groupId>org.apache.hadoop</groupId>
202-
<artifactId>hadoop-auth</artifactId>
203-
<version>${hadoop.version}</version>
204-
<exclusions>
205-
<exclusion>
206-
<groupId>ch.qos.reload4j</groupId>
207-
<artifactId>*</artifactId>
208-
</exclusion>
209-
<exclusion>
210-
<groupId>commons-io</groupId>
211-
<artifactId>*</artifactId>
212-
</exclusion>
213-
<exclusion>
214-
<groupId>com.nimbusds</groupId>
215-
<artifactId>*</artifactId>
216-
</exclusion>
217-
<exclusion>
218-
<groupId>io.dropwizard.metrics</groupId>
219-
<artifactId>*</artifactId>
220-
</exclusion>
221-
<exclusion>
222-
<groupId>org.apache.kerby</groupId>
223-
<artifactId>*</artifactId>
224-
</exclusion>
225-
<exclusion>
226-
<groupId>org.slf4j</groupId>
227-
<artifactId>slf4j-reload4j</artifactId>
228-
</exclusion>
229-
<!--
230-
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
231-
This exclusion can be removed once we update to `apache/hive:4.1.0`.
232-
-->
233-
<exclusion>
234-
<groupId>org.slf4j</groupId>
235-
<artifactId>slf4j-api</artifactId>
236-
</exclusion>
237-
</exclusions>
238-
</dependency>
239-
240-
<!--
241-
TODO Fix class conflicts in master branch of apache/hive .
242-
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
243-
-->
244-
<dependency>
245-
<groupId>commons-codec</groupId>
246-
<artifactId>commons-codec</artifactId>
247-
<version>${commons-codec.version}</version>
248-
</dependency>
249-
<!--
250-
TODO Fix class conflicts in master branch of apache/hive .
251-
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
252-
-->
253-
<dependency>
254-
<groupId>commons-logging</groupId>
255-
<artifactId>commons-logging</artifactId>
256-
<version>${commons-logging.version}</version>
257-
</dependency>
258-
<!--
259-
TODO Fix class conflicts in master branch of apache/hive .
260-
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
261-
-->
262-
<dependency>
263-
<groupId>org.apache.commons</groupId>
264-
<artifactId>commons-text</artifactId>
265-
<version>${commons-text.version}</version>
266-
</dependency>
267-
<!--
268-
TODO Fix class conflicts in trunk branch of apache/hadoop .
269-
Refer to https://github.com/apache/hadoop/blob/release-3.3.6-RC1/hadoop-project/pom.xml#L1244 .
270-
-->
271-
<dependency>
272-
<groupId>org.codehaus.woodstox</groupId>
273-
<artifactId>stax2-api</artifactId>
274-
<version>${stax2-api.version}</version>
275-
</dependency>
276-
<!--
277-
TODO Fix class conflicts in master branch of apache/hive .
278-
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
279-
-->
280-
<dependency>
281-
<groupId>org.slf4j</groupId>
282-
<artifactId>slf4j-api</artifactId>
283-
<version>${slf4j.version}</version>
284-
</dependency>
28537
</dependencies>
28638

28739
<build>
28840
<plugins>
28941
<plugin>
29042
<groupId>org.graalvm.buildtools</groupId>
29143
<artifactId>native-maven-plugin</artifactId>
292-
<version>${native-maven-plugin.version}</version>
29344
</plugin>
29445
</plugins>
29546
</build>

0 commit comments

Comments
 (0)