Merge branch 'master' into add-unit-tests-redshift

Author: burhan94

.github/workflows/cut_release.yml

@@ -10,11 +10,12 @@ jobs:
     steps:
       - name: Setup dependencies
         run: |
+          sudo apt update --fix-missing
           sudo apt-get install -y libxml2-utils python3
           pip3 install lxml beautifulsoup4
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'corretto'
           java-version: '11'

.github/workflows/javadoc_sync.yaml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'corretto'
           java-version: '11'

.github/workflows/maven_push.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'corretto'
           java-version: '11'

.github/workflows/publish_to_maven_central.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Maven Central Repository
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -26,7 +26,7 @@ jobs:
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
       - name: Publish to Apache Maven Central
-        run: mvn clean deploy --batch-mode -Dmaven.compiler.release=11 -am -P release -pl ".,athena-federation-sdk,athena-dynamodb,athena-cloudwatch,athena-cloudwatch-metrics,athena-aws-cmdb,athena-jdbc,athena-mysql"
+        run: mvn clean deploy --batch-mode -Dmaven.compiler.release=11 -am -P release -pl ".,athena-federation-sdk,athena-dynamodb,athena-cloudwatch,athena-cloudwatch-metrics,athena-aws-cmdb,athena-jdbc,athena-mysql,athena-oracle,athena-redshift,athena-postgresql"
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

.github/workflows/run_release_tests.yml

@@ -18,11 +18,11 @@ jobs:
           sudo apt update && sudo apt install -y tar gzip unzip wget less groff vim git python3 python3-pip unixodbc-dev curl jq;
           pip3 install boto3;
       - name: install node and npm
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: 18
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'corretto'
           java-version: '11'
@@ -35,7 +35,7 @@ jobs:
       - name: Setup Repo Root Directory
         run: echo "REPOSITORY_ROOT=$GITHUB_WORKSPACE" >> $GITHUB_ENV
       - name: Setup AWS Cred
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-region: us-east-1
           role-duration-seconds: 18000

Dockerfile

@@ -3,10 +3,10 @@ ARG JAVA_VERSION=11
 # Use the specified version of Java
 FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
 
-# Argument for Java tool options for ssl
-ARG JAVA_TOOL_OPTIONS="-Djavax.net.ssl.trustStore=/var/lang/lib/security/cacerts"
-# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
-ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
+# Argument for Java tool options
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17 and always include default truststore to avoid SSL handshake issues
+ENV JAVA_TOOL_OPTIONS="-Djavax.net.ssl.trustStore=/var/lang/lib/security/cacerts ${JAVA_TOOL_OPTIONS}"
 
 # Install necessary tools
 RUN yum update -y

athena-clickhouse/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.clickhouse</groupId>
             <artifactId>clickhouse-jdbc</artifactId>
-            <version>0.9.1</version>
+            <version>0.9.2</version>
             <classifier>all</classifier>
         </dependency>
         <dependency>

athena-cloudera-hive/META-INF/maven/org.apache.zookeeper/zookeeper-jute/pom.properties

@@ -0,0 +1,3 @@
+artifactId=zookeeper-jute
+groupId=org.apache.zookeeper
+version=3.9.4

athena-cloudera-hive/META-INF/maven/org.apache.zookeeper/zookeeper/pom.properties

@@ -0,0 +1,3 @@
+artifactId=zookeeper
+groupId=org.apache.zookeeper
+version=3.9.4

athena-cloudera-hive/pom.xml

@@ -27,6 +27,17 @@
             <groupId>Hive</groupId>
             <artifactId>HiveJDBC42</artifactId>
             <version>${clouderaVersion}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>3.9.4</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
@@ -90,6 +101,14 @@
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>
+                        <filter>
+                            <artifact>Hive:HiveJDBC42</artifact>
+                            <excludes>
+                                <exclude>org/apache/zookeeper/**</exclude>
+                                <exclude>com/cloudera/hive/jdbc42/internal/apache/zookeeper/**</exclude>
+                                <exclude>META-INF/maven/org.apache.zookeeper/**</exclude>
+                            </excludes>
+                        </filter>
                     </filters>
                     <transformers>
                         <!-- This transformer is here to concatenate log4j2 cache during shading -->
@@ -116,7 +135,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.13</version>
+                <version>0.8.14</version>
                 <executions>
                     <execution>
                         <goals>