Merge branch 'main' into dev-CALCITE-1466

Author: strongduanmu

.github/workflows/main.yml

@@ -142,7 +142,7 @@ jobs:
     name: 'Linux (JDK 11), Newest Guava'
     runs-on: ubuntu-latest
     env:
-      GUAVA: 32.1.1-jre # newest supported Guava version
+      GUAVA: 33.4.0-jre # newest supported Guava version
     steps:
       - name: 'Set up JDK 11'
         uses: actions/setup-java@v4
@@ -204,14 +204,14 @@ jobs:
       run: |
         ./gradlew --no-parallel --no-daemon tasks build javadoc
 
-  linux-jdk22:
-    name: 'Linux (JDK 22)'
+  linux-jdk23:
+    name: 'Linux (JDK 23)'
     runs-on: ubuntu-latest
     steps:
-      - name: 'Set up JDK 22'
+      - name: 'Set up JDK 23'
         uses: actions/setup-java@v4
         with:
-          java-version: 22
+          java-version: 23
           distribution: 'zulu'
       - uses: actions/checkout@v4
         with:

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

@@ -36,7 +36,7 @@ jobs:
       - 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 build-site
       - uses: actions/checkout@v4
         with:
           repository: apache/calcite-site

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

@@ -29,7 +29,7 @@ jobs:
       - 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 build-site
       - name: Build javadoc
         working-directory: site
         run: |

LICENSE

@@ -194,3 +194,7 @@ site/_sass/_mixins.scss
 site/_sass/_pygments.scss
 * normalize:normalize:3.0.2
 site/_sass/_normalize.scss
+
+SIL Open Font License
+* lato-fonts:lato
+site/_sass/_lato.scss

NOTICE

@@ -1,5 +1,5 @@
 Apache Calcite -- Avatica
-Copyright 2012-2024 The Apache Software Foundation
+Copyright 2012-2025 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.26.0
 
 # Overview
 This is a source or binary distribution of Avatica, a framework for

build.gradle.kts

@@ -404,6 +404,7 @@ allprojects {
 
             withType<JavaCompile>().configureEach {
                 options.encoding = "UTF-8"
+                options.compilerArgs.addAll(listOf("-Xlint:deprecation,-options", "-Werror"))
             }
             withType<Test>().configureEach {
                 testLogging {

core/src/main/java/org/apache/calcite/avatica/BuiltInConnectionProperty.java

@@ -18,7 +18,6 @@
 
 import org.apache.calcite.avatica.ha.ShuffledRoundRobinLBStrategy;
 import org.apache.calcite.avatica.remote.AvaticaHttpClientFactoryImpl;
-import org.apache.calcite.avatica.remote.HostnameVerificationConfigurable.HostnameVerification;
 
 import org.apache.hc.core5.util.Timeout;
 
@@ -92,8 +91,13 @@ public enum BuiltInConnectionProperty implements ConnectionProperty {
   /** Password for the key inside keystore */
   KEY_PASSWORD("key_password", Type.STRING, "", false),
 
-  HOSTNAME_VERIFICATION("hostname_verification", Type.ENUM, HostnameVerification.STRICT,
-      HostnameVerification.class, false),
+  @SuppressWarnings("deprecation")
+  HOSTNAME_VERIFICATION("hostname_verification", Type.ENUM,
+      org.apache.calcite.avatica.remote.
+          HostnameVerificationConfigurable.HostnameVerification.STRICT,
+      org.apache.calcite.avatica.remote.
+          HostnameVerificationConfigurable.HostnameVerification.class,
+      false),
 
   TRANSPARENT_RECONNECTION("transparent_reconnection", Type.BOOLEAN, Boolean.FALSE, false),
 

core/src/main/java/org/apache/calcite/avatica/ConnectionConfig.java

@@ -18,7 +18,6 @@
 
 import org.apache.calcite.avatica.ha.LBStrategy;
 import org.apache.calcite.avatica.remote.AvaticaHttpClientFactory;
-import org.apache.calcite.avatica.remote.HostnameVerificationConfigurable.HostnameVerification;
 import org.apache.calcite.avatica.remote.Service;
 
 import java.io.File;
@@ -64,7 +63,9 @@ public interface ConnectionConfig {
   /** @see BuiltInConnectionProperty#KEY_PASSWORD */
   String keyPassword();
   /** @see BuiltInConnectionProperty#HOSTNAME_VERIFICATION */
-  HostnameVerification hostnameVerification();
+  @SuppressWarnings("deprecation")
+  org.apache.calcite.avatica.remote.
+      HostnameVerificationConfigurable.HostnameVerification hostnameVerification();
   /** @see BuiltInConnectionProperty#TRANSPARENT_RECONNECTION */
   boolean transparentReconnectionEnabled();
   /** @see BuiltInConnectionProperty#FETCH_SIZE */

core/src/main/java/org/apache/calcite/avatica/ConnectionConfigImpl.java

@@ -18,7 +18,6 @@
 
 import org.apache.calcite.avatica.ha.LBStrategy;
 import org.apache.calcite.avatica.remote.AvaticaHttpClientFactory;
-import org.apache.calcite.avatica.remote.HostnameVerificationConfigurable.HostnameVerification;
 import org.apache.calcite.avatica.remote.Service;
 
 import java.io.File;
@@ -130,9 +129,12 @@ public String keyPassword() {
 
   }
 
-  public HostnameVerification hostnameVerification() {
+  @SuppressWarnings("deprecation")
+  public org.apache.calcite.avatica.remote.
+      HostnameVerificationConfigurable.HostnameVerification hostnameVerification() {
     return BuiltInConnectionProperty.HOSTNAME_VERIFICATION.wrap(properties)
-        .getEnum(HostnameVerification.class);
+        .getEnum(org.apache.calcite.avatica.remote.
+            HostnameVerificationConfigurable.HostnameVerification.class);
   }
 
   @Override public boolean transparentReconnectionEnabled() {