Revert "Merge branch 'main' of https://github.com/apache/calcite-avat…

.asf.yaml

@@ -32,4 +32,4 @@ notifications:
     commits:      [email protected]
     issues:       [email protected]
     pullrequests: [email protected]
-    jira_options: link label
+    jira_options: link label worklog

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

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

.github/workflows/main.yml

@@ -31,11 +31,11 @@ jobs:
     name: 'Windows (JDK 11)'
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 50
     - name: 'Set up JDK 11'
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v2
       with:
         java-version: 11
         distribution: 'zulu'
@@ -49,32 +49,32 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Set up JDK 8'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v2
         with:
           java-version: 8
           distribution: 'zulu'
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 50
       - name: 'Test'
         run: |
-          ./gradlew --no-parallel --no-daemon tasks build javadoc
+          ./gradlew --no-parallel --no-daemon build javadoc -Pcheckstyle.version=9.3
 
   linux-jdk8-avatica:
     name: 'Linux (JDK 8), Avatica main'
     runs-on: ubuntu-latest
     steps:
     - name: 'Set up JDK 8'
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v2
       with:
         java-version: 8
         distribution: 'zulu'
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 50
     - name: 'Install Avatica to Maven Local'
       run: |
-        ./gradlew publishToMavenLocal -Pcalcite.avatica.version=1.0.0-dev-main -PskipJavadoc
+        ./gradlew publishToMavenLocal -Pcalcite.avatica.version=1.0.0-dev-main -PskipJavadoc -Pcheckstyle.version=9.3
     - name: 'Test Calcite'
       run: |
         git clone --depth 100 https://github.com/apache/calcite.git ../calcite
@@ -89,11 +89,11 @@ jobs:
       TZ: Pacific/Chatham # flips between +12:45 and +13:45
     steps:
       - name: 'Set up JDK 11'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v2
         with:
           java-version: 11
           distribution: 'zulu'
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 50
       - name: 'Test'
@@ -108,16 +108,16 @@ jobs:
       TZ: America/New_York # flips between −05:00 and −04:00
     steps:
       - name: 'Set up JDK 11'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v2
         with:
           java-version: 11
           distribution: 'zulu'
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 50
       - name: 'Test'
         run: |
-          ./gradlew --no-parallel --no-daemon -Pguava.version=${GUAVA:-14.0.1} tasks build
+          ./gradlew --no-parallel --no-daemon -Pguava.version=${GUAVA:-14.0.1} build
 
   linux-jdk11-middle-aged-guava:
     name: 'Linux (JDK 11), Middle-Aged Guava'
@@ -126,11 +126,11 @@ jobs:
       GUAVA: '23.0' # a middle-aged Guava version
     steps:
       - name: 'Set up JDK 11'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v2
         with:
           java-version: 11
           distribution: 'zulu'
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 50
       - name: 'Test'
@@ -142,14 +142,14 @@ jobs:
     name: 'Linux (JDK 11), Newest Guava'
     runs-on: ubuntu-latest
     env:
-      GUAVA: 32.1.1-jre # newest supported Guava version
+      GUAVA: 31.1-jre # newest supported Guava version
     steps:
       - name: 'Set up JDK 11'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v2
         with:
           java-version: 11
           distribution: 'zulu'
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 50
       - name: 'Test'
@@ -161,61 +161,45 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: 'Set up JDK 17'
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v2
       with:
         java-version: 17
         distribution: 'zulu'
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 50
     - name: 'Test'
       run: |
         ./gradlew --no-parallel --no-daemon build javadoc
 
-  linux-jdk21:
-    name: 'Linux (JDK 21)'
+  linux-jdk18:
+    name: 'Linux (JDK 18)'
     runs-on: ubuntu-latest
     steps:
-      - name: 'Set up JDK 21'
-        uses: actions/setup-java@v4
+      - name: 'Set up JDK 18'
+        uses: actions/setup-java@v2
         with:
-          java-version: 21
+          java-version: 18
           distribution: 'zulu'
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 50
       - name: 'Test'
         run: |
           ./gradlew --no-parallel --no-daemon build
 
   mac:
-    name: 'macOS (JDK 21)'
+    name: 'macOS (JDK 18)'
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 50
-    - name: 'Set up JDK 21'
-      uses: actions/setup-java@v4
+    - name: 'Set up JDK 18'
+      uses: actions/setup-java@v2
       with:
-        java-version: 21
+        java-version: 18
         distribution: 'zulu'
     - name: 'Test'
       run: |
-        ./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
+        ./gradlew --no-parallel --no-daemon build javadoc

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

@@ -32,12 +32,12 @@ jobs:
    publish-website:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - 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
+          docker-compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g) build-site
+      - uses: actions/checkout@v3
         with:
           repository: apache/calcite-site
           path: calcite-site

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

@@ -25,16 +25,16 @@ jobs:
   publish-website:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Build site
         working-directory: site
         run: |
-          docker compose run -e JEKYLL_UID=$(id -u) -e JEKYLL_GID=$(id -g) build-site
+          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
+          docker-compose run generate-javadoc
+      - uses: actions/checkout@v3
         with:
           repository: apache/calcite-site
           path: calcite-site

.gitignore

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

.ratignore

@@ -1,7 +1,6 @@
 **/.gitattributes
 **/.gitignore
 .ratignore
-.idea/vcs.xml
 # Third-party license files
 src/main/config/licenses/
 #

LICENSE

@@ -181,16 +181,9 @@ Additional License files can be found in the 'licenses' folder located in the sa
 - Software produced outside the ASF which is available under other licenses (not Apache-2.0)
 
 MIT
+* cobyism:html5shiv:3.7.2
 * font-awesome:font-awesome-code:4.2.0
-site/_sass/_font-awesome.scss
-* cobyism:gridism:
-site/_sass/_gridism.scss
+* gridsim:gridsim:
 * jekyll:jekyll:
-site/css/screen.scss
-site/_includes/*.html
-site/_layouts/*.html
-site/news/releases/index.html
-site/_sass/_mixins.scss
-site/_sass/_pygments.scss
 * normalize:normalize:3.0.2
-site/_sass/_normalize.scss
+* respond:respond:1.4.2

NOTICE

@@ -1,5 +1,5 @@
 Apache Calcite -- Avatica
-Copyright 2012-2024 The Apache Software Foundation
+Copyright 2012-2023 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

README

@@ -1,4 +1,4 @@
-Apache Calcite Avatica release 1.25.0
+Apache Calcite Avatica release 1.23.0
 
 # Overview
 This is a source or binary distribution of Avatica, a framework for

bom/build.gradle.kts

@@ -55,8 +55,6 @@ dependencies {
         apiv("com.h2database:h2")
         apiv("javax.servlet:javax.servlet-api", "servlet")
         apiv("junit:junit")
-        apiv("net.bytebuddy:byte-buddy", "bytebuddy")
-        apiv("net.bytebuddy:byte-buddy-agent", "bytebuddy")
         apiv("net.hydromatic:scott-data-hsqldb")
         apiv("org.apache.httpcomponents.client5:httpclient5")
         apiv("org.apache.httpcomponents.core5:httpcore5")