This is an automated email from the ASF dual-hosted git repository.
zabetak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git
The following commit(s) were added to refs/heads/main by this push:
new 360c0e7c8 [CALCITE-5095] Support Java 18 and Guava 31.1-jre
360c0e7c8 is described below
commit 360c0e7c84d754b7fffb64c0e021dbb1833ee283
Author: Benchao Li <[email protected]>
AuthorDate: Wed Apr 20 08:36:40 2022 +0800
[CALCITE-5095] Support Java 18 and Guava 31.1-jre
Close apache/calcite-avatica#178
---
.github/workflows/main.yml | 6 +++---
.travis.yml | 6 +++---
gradle.properties | 2 +-
site/_docs/history.md | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d4b4e9576..7f7b0e52e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -79,16 +79,16 @@ jobs:
./gradlew --no-parallel --no-daemon build javadoc
mac:
- name: 'macOS (JDK 14)'
+ name: 'macOS (JDK 18)'
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 50
- - name: 'Set up JDK 14'
+ - name: 'Set up JDK 18'
uses: actions/setup-java@v1
with:
- java-version: 14
+ java-version: 18
- name: 'Test'
run: |
./gradlew --no-parallel --no-daemon build javadoc
diff --git a/.travis.yml b/.travis.yml
index 9cac5a144..471b93374 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@
#
# Configuration file for Travis continuous integration.
-# See https://travis-ci.org/apache/calcite-avatica
+# See https://travis-ci.com/github/apache/calcite-avatica
language: java
matrix:
fast_finish: true
@@ -50,11 +50,11 @@ matrix:
- install: true
jdk: openjdk11
env:
- - GUAVA=31.0.1-jre # newest supported Guava version
+ - GUAVA=31.1-jre # newest supported Guava version
script:
- ./gradlew $GRADLE_ARGS -Pguava.version=${GUAVA:-14.0.1} build
- install: true
- jdk: openjdk15
+ jdk: openjdk18
env:
script:
- ./gradlew $GRADLE_ARGS build
diff --git a/gradle.properties b/gradle.properties
index d1f780aef..b43302bd8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -60,7 +60,7 @@ bouncycastle.version=1.60
dropwizard-metrics.version=4.0.5
# We support Guava versions as old as 14.0.1 (the version used by Hive)
# but prefer more recent versions.
-guava.version=31.0.1-jre
+guava.version=31.1-jre
hamcrest.version=1.3
hsqldb.version=2.4.1
h2.version=1.4.197
diff --git a/site/_docs/history.md b/site/_docs/history.md
index 77d5edf0b..c81abe2ca 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -36,9 +36,9 @@ Apache Calcite Avatica 1.21.0 is under development.
Compatibility: This release is tested
on Linux, macOS, Microsoft Windows;
-using Oracle JDK 8, 9, 10, 11, 12, 13, 14, 15, 16, 17;
+using Oracle JDK 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18;
using IBM Java 8;
-Guava versions 14.0.1 to 31.0.1-jre;
+Guava versions 14.0.1 to 31.1-jre;
other software versions as specified in `gradle.properties`.
Contributors to this release:
