This is an automated email from the ASF dual-hosted git repository.

asolimando pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/main by this push:
     new 2c30a56158 [CALCITE-5306] Remove JDK15/16 EOL non-LTS JDKs in CI
2c30a56158 is described below

commit 2c30a56158cdd351d35725006bc1f76bb6aac75b
Author: Alessandro Solimando <alessandro.solima...@gmail.com>
AuthorDate: Tue Oct 4 16:41:55 2022 +0200

    [CALCITE-5306] Remove JDK15/16 EOL non-LTS JDKs in CI
    
    - Travis: JDK 15 -> JDK 17 (LTS), and JDK 16 -> JDK 18 (latest supported)
    - Appveyoir: JDK 8 -> JDK 11 (JDK 8 for windows is covered in GitHub 
actions), and JDK 16 -> JDK 17 (LTS)
    - GitHub Actions: dropped job for OpenJ9-JDK8
    - Upgraded forbiddenapis plugin from 3.1 to 3.4
    
    JDK 19 is not supported yet by forbiddenapis
---
 .github/workflows/main.yml | 33 ---------------------------------
 .travis.yml                | 16 +++++-----------
 appveyor.yml               |  4 ++--
 gradle.properties          |  2 +-
 4 files changed, 8 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ac12876aa8..5cfc8d3b37 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -121,39 +121,6 @@ jobs:
           calcite.avatica.version=1.0.0-dev-main-SNAPSHOT
           enableMavenLocal=
 
-  linux-openj9:
-    if: github.event.action != 'labeled'
-    name: 'Linux (OpenJ9 8)'
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 50
-      - uses: AdoptOpenJDK/install-jdk@v1
-        with:
-          impl: openj9
-          version: '8'
-          architecture: x64
-      - uses: burrunan/gradle-cache-action@v1
-        name: Test
-        env:
-          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ 
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
-          S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
-        with:
-          job-id: jdk8-openj9
-          remote-build-cache-proxy-enabled: false
-          # Temporarily disable hadoop related tests due to 
https://github.com/eclipse-openj9/openj9/issues/14950
-          arguments: --scan --no-parallel --no-daemon -x :piglet:test -x 
:spark:test build javadoc
-      - name: 'sqlline and sqllsh'
-        run: |
-          ./sqlline -e '!quit'
-          echo
-          echo Sqlline example/csv
-          ./example/csv/sqlline --verbose -u 
jdbc:calcite:model=example/csv/src/test/resources/model.json -n admin -p admin 
-f example/csv/src/test/resources/smoke_test.sql
-          echo
-          echo sqlsh
-          ./sqlsh -o headers "select count(*) commits, author from (select 
substring(author, 1, position(' <' in author)-1) author from git_commits) group 
by author order by count(*) desc, author limit 20"
-
   mac:
     if: github.event.action != 'labeled'
     name: 'macOS (JDK 18)'
diff --git a/.travis.yml b/.travis.yml
index 36cea90b63..06c772907e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ language: java
 matrix:
   fast_finish: true
   include:
-    - jdk: openjdk8
+    - jdk: openjdk8 # LTS JDK version, EOL but don't remove until it's safe
       env:
         - TZ=America/New_York # flips between −05:00 and −04:00
         - GUAVA=19.0 # oldest supported Guava version
@@ -31,26 +31,20 @@ matrix:
       script:
         - export _JAVA_OPTIONS="-XX:GCTimeLimit=90 -XX:GCHeapFreeLimit=35"
         - travis_wait ./gradlew --no-parallel --no-daemon --scan 
-Pguava.version=${GUAVA:-29.0-jre} -PenableCheckerframework :linq4j:classes 
:core:classes
-    - jdk: openjdk11
+    - jdk: openjdk11 # LTS JDK version, don't remove until EOL
       env:
         - ERRORPRONE=Y
-        - GUAVA=31.1-jre # ErrorProne checks for Beta APIs, so use newest 
supported Guava version
+        - GUAVA=31.1-jre # ErrorProne checks for Beta APIs, so use the newest 
supported Guava version
       script:
         - export _JAVA_OPTIONS="-XX:GCTimeLimit=90 -XX:GCHeapFreeLimit=35"
         - ./gradlew --no-parallel --no-daemon --scan 
-Pguava.version=${GUAVA:-29.0-jre} -PenableErrorprone classes
     - jdk: openjdk11
       env:
         - TZ=Pacific/Chatham # flips between +12:45 and +13:45
-    - jdk: openjdk15
-      env:
-        - GUAVA=31.1-jre # newest supported Guava version
-    - jdk: openjdk16
-      env:
-        - GUAVA=31.1-jre
-    - jdk: openjdk17
+    - jdk: openjdk17 # LTS JDK version, don't remove until EOL
       env:
         - GUAVA=31.1-jre
-    - jdk: openjdk18
+    - jdk: openjdk18 # latest JDK version supported by ForbiddenAPIs plugin, 
keep this updated (see https://jdk.java.net/)
       env:
         - GUAVA=31.1-jre
 branches:
diff --git a/appveyor.yml b/appveyor.yml
index 206abeebc4..0835ecb4e7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -37,8 +37,8 @@ matrix:
   fast_finish: true
 environment:
   matrix:
-    - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
-    - JAVA_HOME: C:\Program Files\Java\jdk16
+    - JAVA_HOME: C:\Program Files\Java\jdk11
+    - JAVA_HOME: C:\Program Files\Java\jdk17 # switch to latest as soon as 
available (see https://www.appveyor.com/docs/windows-images-software/#java)
 build_script:
   - ./gradlew assemble javadoc
 test_script:
diff --git a/gradle.properties b/gradle.properties
index f50de1ee46..95ba37123a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -50,7 +50,7 @@ com.github.johnrengelman.shadow.version=5.1.0
 com.github.spotbugs.version=2.0.0
 com.github.vlsi.vlsi-release-plugins.version=1.76
 com.google.protobuf.version=0.8.10
-de.thetaphi.forbiddenapis.version=3.1
+de.thetaphi.forbiddenapis.version=3.4
 kotlin.version=1.5.31
 net.ltgt.errorprone.version=1.3.0
 me.champeau.gradle.jmh.version=0.5.3

Reply via email to