Merge pull request #4 from datametica/master_2

Master 2

.asf.yaml

@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+github:
+  description: "Apache Calcite Avatica"
+  homepage: https://calcite.apache.org/avatica/
+  features:
+    wiki: false
+    issues: false
+    projects: false
+  enabled_merge_buttons:
+    # "squash and merge" replaces committer with noreply@github, and we don't want that
+    # See https://lists.apache.org/thread/vxxpt1x316kjryb4dptsbs95p66d9xrv
+    squash:  false
+    # We prefer linear history, so creating merge commits is disabled in UI
+    merge:   false
+    rebase:  true
+notifications:
+    commits:      [email protected]
+    issues:       [email protected]
+    pullrequests: [email protected]
+    jira_options: link label

.github/workflows/gradle-wrapper-validation.yml

@@ -22,5 +22,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1

.github/workflows/main.yml

@@ -31,49 +31,191 @@ jobs:
     name: 'Windows (JDK 11)'
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 50
     - name: 'Set up JDK 11'
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: 11
+        distribution: 'zulu'
     - name: 'Test'
       shell: cmd
       run: |
         ./gradlew --no-parallel --no-daemon build javadoc
 
-  linux-avatica:
-    name: 'Linux (JDK 8), Avatica master'
+  linux-jdk8:
+    name: 'Linux (JDK 8)'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Set up JDK 8'
+        uses: actions/setup-java@v4
+        with:
+          java-version: 8
+          distribution: 'zulu'
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 50
+      - name: 'Test'
+        run: |
+          ./gradlew --no-parallel --no-daemon tasks build javadoc
+
+  linux-jdk8-avatica:
+    name: 'Linux (JDK 8), Avatica main'
     runs-on: ubuntu-latest
     steps:
     - name: 'Set up JDK 8'
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: 8
-    - uses: actions/checkout@v2
+        distribution: 'zulu'
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 50
     - name: 'Install Avatica to Maven Local'
       run: |
-        ./gradlew publishToMavenLocal -Pcalcite.avatica.version=1.0.0-dev-master -PskipJavadoc
+        ./gradlew publishToMavenLocal -Pcalcite.avatica.version=1.0.0-dev-main -PskipJavadoc
     - name: 'Test Calcite'
       run: |
         git clone --depth 100 https://github.com/apache/calcite.git ../calcite
         cd ../calcite
-        ./gradlew --no-parallel --no-daemon build -Pcalcite.avatica.version=1.0.0-dev-master-SNAPSHOT -PenableMavenLocal
+        ./gradlew --no-parallel --no-daemon build -Pcalcite.avatica.version=1.0.0-dev-main-SNAPSHOT -PenableMavenLocal
+
+  linux-jdk11-oldest-guava-tz:
+    name: 'Linux (JDK 11), Oldest Guava, Pacific/Chatham Timezone'
+    runs-on: ubuntu-latest
+    env:
+      GUAVA: 14.0.1 # oldest supported Guava version
+      TZ: Pacific/Chatham # flips between +12:45 and +13:45
+    steps:
+      - name: 'Set up JDK 11'
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: 'zulu'
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 50
+      - name: 'Test'
+        run: |
+          ./gradlew --no-parallel --no-daemon -Pguava.version=${GUAVA:-14.0.1} build
+
+  linux-jdk11-minimum-guava-tz:
+    name: 'Linux (JDK 11), Calcite Minimum Guava, America/New_York Timezone'
+    runs-on: ubuntu-latest
+    env:
+      GUAVA: '19.0' # Calcite's minimum Guava version
+      TZ: America/New_York # flips between −05:00 and −04:00
+    steps:
+      - name: 'Set up JDK 11'
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: 'zulu'
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 50
+      - name: 'Test'
+        run: |
+          ./gradlew --no-parallel --no-daemon -Pguava.version=${GUAVA:-14.0.1} tasks build
+
+  linux-jdk11-middle-aged-guava:
+    name: 'Linux (JDK 11), Middle-Aged Guava'
+    runs-on: ubuntu-latest
+    env:
+      GUAVA: '23.0' # a middle-aged Guava version
+    steps:
+      - name: 'Set up JDK 11'
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: 'zulu'
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 50
+      - name: 'Test'
+        run: |
+          # Disable getLicenses for Guava 22..29 because of [CALCITE-4815]
+          ./gradlew --no-parallel --no-daemon -Pguava.version=${GUAVA:-14.0.1} build -x :standalone-server:licenseCopySpec -x :standalone-server:getLicenses -x :standalone-server:license -x :tck:licenseCopySpec -x :tck:getLicenses -x :tck:license
+
+  linux-jdk11-newest-guava:
+    name: 'Linux (JDK 11), Newest Guava'
+    runs-on: ubuntu-latest
+    env:
+      GUAVA: 32.1.1-jre # newest supported Guava version
+    steps:
+      - name: 'Set up JDK 11'
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: 'zulu'
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 50
+      - name: 'Test'
+        run: |
+          ./gradlew --no-parallel --no-daemon -Pguava.version=${GUAVA:-14.0.1} build
+
+  linux-jdk17:
+    name: 'Linux (JDK 17)'
+    runs-on: ubuntu-latest
+    steps:
+    - name: 'Set up JDK 17'
+      uses: actions/setup-java@v4
+      with:
+        java-version: 17
+        distribution: 'zulu'
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 50
+    - name: 'Test'
+      run: |
+        ./gradlew --no-parallel --no-daemon build javadoc
+
+  linux-jdk21:
+    name: 'Linux (JDK 21)'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Set up JDK 21'
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'zulu'
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 50
+      - name: 'Test'
+        run: |
+          ./gradlew --no-parallel --no-daemon build
 
   mac:
-    name: 'macOS (JDK 14)'
+    name: 'macOS (JDK 21)'
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 50
-    - name: 'Set up JDK 14'
-      uses: actions/setup-java@v1
+    - name: 'Set up JDK 21'
+      uses: actions/setup-java@v4
       with:
-        java-version: 14
+        java-version: 21
+        distribution: 'zulu'
     - name: 'Test'
       run: |
-        ./gradlew --no-parallel --no-daemon build javadoc
+        ./gradlew --no-parallel --no-daemon tasks build javadoc
+
+  linux-jdk22:
+    name: 'Linux (JDK 22)'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Set up JDK 22'
+        uses: actions/setup-java@v4
+        with:
+          java-version: 22
+          distribution: 'zulu'
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 50
+      - name: 'Test'
+        run: |
+          ./gradlew --no-parallel --no-daemon build

.github/workflows/publish-non-release-website-updates.yml

@@ -0,0 +1,58 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+name: Publish non-release website updates
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'site/**'                       # Trigger only for changes to files in the site/ folder
+      - '!site/_docs/**'                # except for files in the site/_docs/ folder
+      - 'site/_docs/docker_images.md'   # unless the file is site/_docs/docker_images.md
+      - 'site/_docs/history.md'         # or site/_docs/history.md
+      - 'site/_docs/howto.md'           # or site/_docs/howto.md
+      - 'site/_docs/index.md'           # or site/_docs/index.md
+
+jobs:
+   publish-website:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build site
+        working-directory: site
+        run: |
+          docker compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g) build-site
+      - uses: actions/checkout@v4
+        with:
+          repository: apache/calcite-site
+          path: calcite-site
+          token: ${{ secrets.CALCITE_WEBSITE_BUILD }}
+      - name: Publish site
+        working-directory: calcite-site
+        run: |
+          git config user.email ${{ github.actor }}@users.noreply.github.com
+          git config user.name ${{ github.actor }}
+          rm -rf avatica/
+          mv ../site/target/avatica/ .
+          git reset -- avatica/javadocAggregate/       # Restore the avatica javadoc
+          git checkout -- avatica/javadocAggregate/
+          git add .
+          if ! git diff-index --quiet HEAD; then
+            git commit -m "Website deployed from calcite-avatica@$GITHUB_SHA"
+            git push origin main
+          fi

.github/workflows/publish-site-and-javadocs-on-release.yml

@@ -0,0 +1,53 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+name: Publish website on release
+
+on:
+  push:
+    tags:
+      - rel/avatica-[0-9]+.[0-9]+.[0-9]+ # Trigger only when the tag matches rel/avatica-X.Y.Z
+
+jobs:
+  publish-website:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build site
+        working-directory: site
+        run: |
+          docker compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g) build-site
+      - name: Build javadoc
+        working-directory: site
+        run: |
+          docker compose run generate-javadoc
+      - uses: actions/checkout@v4
+        with:
+          repository: apache/calcite-site
+          path: calcite-site
+          token: ${{ secrets.CALCITE_WEBSITE_BUILD }}
+      - name: Publish site
+        working-directory: calcite-site
+        run: |
+          git config user.email ${{ github.actor }}@users.noreply.github.com
+          git config user.name ${{ github.actor }}
+          rm -rf avatica/
+          mv ../site/target/avatica/ .
+          git add .
+          if ! git diff-index --quiet HEAD; then
+            git commit -m "Website deployed from calcite-avatica@$GITHUB_SHA"
+            git push origin main
+          fi

.gitignore

@@ -1,6 +1,7 @@
 **/.editorconfig
 *~
 /.idea
+!/.idea/vcs.xml
 *.iml
 settings.xml
 .classpath.txt