Skip to content

Commit

Permalink
Bump base HiveServer2 JDBC Driver version to 4.0.1 (#10)
Browse files Browse the repository at this point in the history
  • Loading branch information
@linghengqian
linghengqian authored Oct 5, 2024
1 parent 00de0c5 commit 5c45fb5
Show file tree
Hide file tree
Showing 13 changed files with 268 additions and 480 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
if: github.repository == 'linghengqian/hive-server2-jdbc-driver'
strategy:
matrix:
java: [ '8' ]
java: [ '8', '23' ]
os: [ 'ubuntu-latest' ]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -43,13 +43,14 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- run: |
mvn -T 1.5C clean test
mvn wrapper:wrapper -Dmaven=3.9.9
./mvnw -T 1.5C clean test
native-test-ci:
name: NativeTest - GraalVM CE for JDK ${{ matrix.java }} on ${{ matrix.os }}
if: github.repository == 'linghengqian/hive-server2-jdbc-driver'
strategy:
matrix:
java: [ '22.0.2' ]
java: [ '22.0.2', '23' ]
os: [ 'ubuntu-latest' ]
runs-on: ${{ matrix.os }}
steps:
Expand Down
18 changes: 0 additions & 18 deletions .licenserc.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,6 @@ dependency:
files:
- pom.xml
licenses:
- name: org.apache.hadoop.thirdparty:hadoop-shaded-guava
version: 1.1.1
license: Apache-2.0
- name: org.apache.zookeeper:zookeeper
version: 3.6.3,3.8.3
license: Apache-2.0
- name: com.google.guava:failureaccess
version: "1.0"
license: Apache-2.0
- name: com.google.guava:listenablefuture
version: 9999.0-empty-to-avoid-conflict-with-guava
license: Apache-2.0
- name: org.apache.zookeeper:zookeeper-jute
version: 3.6.3,3.8.3
license: Apache-2.0
- name: org.slf4j:slf4j-api
version: 1.7.30
license: MIT
- name: org.codehaus.woodstox:stax2-api
version: 4.2.1
license: BSD-2-Clause
403 changes: 202 additions & 201 deletions LICENSE
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion NOTICE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Third-party builds of the HiveServer2 JDBC Driver

The purpose of the current project is to create a `Thin JAR` of HiveServer2 JDBC Driver.
All release products have been verified and usable in the GraalVM Native Image compiled by GraalVM CE For JDK 22.0.2.
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.

The steps to use directly in Maven are as follows.
The latest version is available
Expand Down
8 changes: 8 additions & 0 deletions doc/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

## v1

### 1.5.0

1. Bump base HiveServer2 JDBC Driver version to `4.0.1`.
2. Support for Thin JAR and Uber JAR of HiveServer2 JDBC Driver under OpenJDK 23.
3. Supports using Thin JAR and Uber JAR of HiveServer2 JDBC Driver in GraalVM Native Image compiled by GraalVM CE For JDK23.

Build from `apache/hive:rel/release-4.0.1`.

### 1.4.0

Updates Apache-2.0 license header.
Expand Down
2 changes: 1 addition & 1 deletion doc/CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Then execute the following command.
Suppose the release to be released is `1.1.0`, and the next version is `1.2.0-SNAPSHOT`.

```shell
sdk use java 8.0.422-tem
sdk use java 22.0.2-graalce
git clone git@github.com:linghengqian/hive-server2-jdbc-driver.git
cd ./hive-server2-jdbc-driver/
./mvnw versions:set -DgenerateBackupPoms=false -DnewVersion=1.1.0
Expand Down
1 change: 0 additions & 1 deletion hive-server2-jdbc-driver-thin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,6 @@
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
<version>${native-maven-plugin.version}</version>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion ...c/test/java/io/github/linghengqian/hive/server2/jdbc/driver/thin/HiveServer2ThinTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
public class HiveServer2ThinTest {

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

Expand Down
249 changes: 0 additions & 249 deletions hive-server2-jdbc-driver-uber/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,262 +34,13 @@
<version>${apache-hive-jdbc.version}</version>
<classifier>standalone</classifier>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.gson</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.re2j</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.jcraft</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>commons-cli</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>commons-net</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.github.pjfanning</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.thoughtworks.paranamer</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>dnsjava</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.avro</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop.thirdparty</groupId>
<artifactId>hadoop-shaded-protobuf_3_7</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.kerby</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.xerial.snappy</groupId>
<artifactId>*</artifactId>
</exclusion>
<!--
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
This exclusion can be removed once we update to `apache/hive:4.1.0`.
-->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<!--
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
This exclusion can be removed once we update to `apache/hive:4.1.0`.
-->
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<!--
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
This exclusion can be removed once we update to `apache/hive:4.1.0`.
-->
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!--
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
This exclusion can be removed once we update to `apache/hive:4.1.0`.
-->
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</exclusion>
<!--
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
This exclusion can be removed once we update to `apache/hive:4.1.0`.
-->
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
</exclusion>
<!--
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
This exclusion can be removed once we update to `apache/hive:4.1.0`.
-->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.nimbusds</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.kerby</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
<!--
TODO This has been fixed at https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
This exclusion can be removed once we update to `apache/hive:4.1.0`.
-->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<!--
TODO Fix class conflicts in master branch of apache/hive .
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
-->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>
<!--
TODO Fix class conflicts in master branch of apache/hive .
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
-->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
</dependency>
<!--
TODO Fix class conflicts in master branch of apache/hive .
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>${commons-text.version}</version>
</dependency>
<!--
TODO Fix class conflicts in trunk branch of apache/hadoop .
Refer to https://github.com/apache/hadoop/blob/release-3.3.6-RC1/hadoop-project/pom.xml#L1244 .
-->
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>${stax2-api.version}</version>
</dependency>
<!--
TODO Fix class conflicts in master branch of apache/hive .
Refer to https://github.com/apache/hive/commit/b09d76e68bfba6be19733d864b3207f95265d11f .
-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
<version>${native-maven-plugin.version}</version>
</plugin>
</plugins>
</build>
Expand Down
Loading

0 comments on commit 5c45fb5

Please sign in to comment.