From 6dc378a7917cb3a4e2ed5127d1835955cb1374b9 Mon Sep 17 00:00:00 2001
From: Ling Hengqian <linghengqian@outlook.com>
Date: Thu, 26 Jan 2023 22:39:39 +0800
Subject: [PATCH] - Use GraalVM CE 22.3.1 instead of GraalVM CE 23.0 Dev
(#23728)
- Update OpenGauss JDBC to 3.1.0-og to match GraalVM reachability metadata
- Update Commons DBCP2 to 2.9.0 to match GraalVM reachability metadata in the future nativeTest
- Update native-maven-plugin to 0.9.19 to output richer Native Image build logs
---
.github/workflows/nightly-build-artifact.yml | 2 +-
distribution/proxy-native/pom.xml | 2 +-
distribution/proxy-native/src/main/release-docs/LICENSE | 2 +-
distribution/proxy/src/main/release-docs/LICENSE | 2 +-
pom.xml | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/nightly-build-artifact.yml b/.github/workflows/nightly-build-artifact.yml
index d5497a4de1ba5..8b8b14aaea72c 100644
--- a/.github/workflows/nightly-build-artifact.yml
+++ b/.github/workflows/nightly-build-artifact.yml
@@ -114,7 +114,7 @@ jobs:
ref: ${{ inputs.commit-id }}
- uses: graalvm/setup-graalvm@v1
with:
- version: 'dev'
+ version: '22.3.1'
java-version: '17'
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/distribution/proxy-native/pom.xml b/distribution/proxy-native/pom.xml
index 8e42105368cb0..1e42518e118ae 100644
--- a/distribution/proxy-native/pom.xml
+++ b/distribution/proxy-native/pom.xml
@@ -31,7 +31,7 @@
<native.image.name>apache-shardingsphere-proxy-native</native.image.name>
<native.image.repository>apache/shardingsphere-proxy-native</native.image.repository>
<exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
- <native.maven.plugin.version>0.9.17</native.maven.plugin.version>
+ <native.maven.plugin.version>0.9.19</native.maven.plugin.version>
</properties>
<dependencies>
diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE
index 7ab7c219f02c5..9ed1877c9fc1d 100644
--- a/distribution/proxy-native/src/main/release-docs/LICENSE
+++ b/distribution/proxy-native/src/main/release-docs/LICENSE
@@ -317,7 +317,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
asm 9.1: https://github.com/llbit/ow2-asm, BSD-3-Clause
commons-compiler 3.1.8: https://github.com/janino-compiler/janino, BSD-3-Clause
janino 3.1.8: https://github.com/janino-compiler/janino, BSD-3-Clause
- opengauss-jdbc 3.0.0: https://gitee.com/opengauss/openGauss-connector-jdbc, BSD-2-Clause
+ opengauss-jdbc 3.1.0-og: https://gitee.com/opengauss/openGauss-connector-jdbc, BSD-2-Clause
postgresql 42.4.1: https://github.com/pgjdbc/pgjdbc, BSD-2-Clause
protobuf-java 3.17.2: https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
protobuf-java-util 3.17.2: https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE
index 29e54d10e521b..37e07a7e84a09 100644
--- a/distribution/proxy/src/main/release-docs/LICENSE
+++ b/distribution/proxy/src/main/release-docs/LICENSE
@@ -319,7 +319,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
asm 9.1: https://github.com/llbit/ow2-asm, BSD-3-Clause
commons-compiler 3.1.8: https://github.com/janino-compiler/janino, BSD-3-Clause
janino 3.1.8: https://github.com/janino-compiler/janino, BSD-3-Clause
- opengauss-jdbc 3.0.0: https://gitee.com/opengauss/openGauss-connector-jdbc, BSD-2-Clause
+ opengauss-jdbc 3.1.0-og: https://gitee.com/opengauss/openGauss-connector-jdbc, BSD-2-Clause
postgresql 42.4.1: https://github.com/pgjdbc/pgjdbc, BSD-2-Clause
protobuf-java 3.19.6: https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
protobuf-java-util 3.19.6: https://github.com/protocolbuffers/protobuf/blob/master/java, BSD-3-Clause
diff --git a/pom.xml b/pom.xml
index 94f4c3fd940d7..4927eca3bf9b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,14 +94,14 @@
<lombok.version>1.18.20</lombok.version>
<postgresql.version>42.4.1</postgresql.version>
- <opengauss.version>3.0.0</opengauss.version>
+ <opengauss.version>3.1.0-og</opengauss.version>
<mysql-connector-java.version>5.1.47</mysql-connector-java.version>
<mariadb-java-client.version>2.4.2</mariadb-java-client.version>
<h2.version>2.1.214</h2.version>
<mssql.version>6.1.7.jre8-preview</mssql.version>
<hikari-cp.version>4.0.3</hikari-cp.version>
- <commons-dbcp2.version>2.2.0</commons-dbcp2.version>
+ <commons-dbcp2.version>2.9.0</commons-dbcp2.version>
<junit5.version>5.9.1</junit5.version>
<junit4.version>4.13.2</junit4.version>