From 9853060caf79760e749f38d8aeccd0be6984158b Mon Sep 17 00:00:00 2001 From: Aimery Methena <159072740+aimethed@users.noreply.github.com> Date: Wed, 23 Oct 2024 10:40:35 -0400 Subject: [PATCH 01/28] update validation_testing to use ECR (#2351) --- .github/workflows/run_release_tests.yml | 1 - .../app/lib/stacks/dynamo-stack.ts | 1 + .../app/lib/stacks/opensearch-stack.ts | 1 + .../app/lib/stacks/rds-generic-stack.ts | 1 + .../app/lib/stacks/redshift-stack.ts | 1 + validation_testing/deploy_infra.sh | 24 ++++++++++++----- validation_testing/main.py | 1 - validation_testing/run_release_tests.sh | 26 +++++++++++++++---- 8 files changed, 43 insertions(+), 13 deletions(-) diff --git a/.github/workflows/run_release_tests.yml b/.github/workflows/run_release_tests.yml index a7a1b9bd11..feebd4bb3d 100644 --- a/.github/workflows/run_release_tests.yml +++ b/.github/workflows/run_release_tests.yml @@ -50,5 +50,4 @@ jobs: RESULTS_LOCATION: ${{ secrets.RESULTS_LOCATION }} DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }} S3_DATA_PATH: ${{ secrets.S3_DATA_PATH }} - S3_JARS_BUCKET: ${{ secrets.S3_JARS_BUCKET }} SPILL_BUCKET: ${{ secrets.SPILL_BUCKET }} diff --git a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/dynamo-stack.ts b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/dynamo-stack.ts index 0cd3bacb84..5c36662343 100644 --- a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/dynamo-stack.ts +++ b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/dynamo-stack.ts @@ -2,6 +2,7 @@ import * as cdk from 'aws-cdk-lib'; import * as glue from '@aws-cdk/aws-glue-alpha'; import * as ddb from 'aws-cdk-lib/aws-dynamodb'; import * as iam from 'aws-cdk-lib/aws-iam'; +import { Repository } from 'aws-cdk-lib/aws-ecr'; import { CfnInclude } from 'aws-cdk-lib/cloudformation-include'; import { Construct } from 'constructs'; import tpcdsJson from '../../resources/tpcds_specs.json' diff --git a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/opensearch-stack.ts b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/opensearch-stack.ts index 5b2378e815..1ca38debec 100644 --- a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/opensearch-stack.ts +++ b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/opensearch-stack.ts @@ -5,6 +5,7 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as glue from '@aws-cdk/aws-glue-alpha'; import * as s3 from 'aws-cdk-lib/aws-s3'; import * as iam from 'aws-cdk-lib/aws-iam'; +import { Repository } from 'aws-cdk-lib/aws-ecr'; import { CfnInclude } from 'aws-cdk-lib/cloudformation-include'; const path = require('path'); import {FederationStackProps} from './stack-props' diff --git a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/rds-generic-stack.ts b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/rds-generic-stack.ts index c6bde711fc..e0a97a2c13 100644 --- a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/rds-generic-stack.ts +++ b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/rds-generic-stack.ts @@ -3,6 +3,7 @@ import * as rds from 'aws-cdk-lib/aws-rds'; import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as glue from '@aws-cdk/aws-glue-alpha'; import * as iam from 'aws-cdk-lib/aws-iam' +import { Repository } from 'aws-cdk-lib/aws-ecr'; import { CfnInclude } from 'aws-cdk-lib/cloudformation-include'; import { Construct } from 'constructs'; const path = require('path') diff --git a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/redshift-stack.ts b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/redshift-stack.ts index 8f70345b02..f54b849e95 100644 --- a/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/redshift-stack.ts +++ b/validation_testing/cdk_federation_infra_provisioning/app/lib/stacks/redshift-stack.ts @@ -7,6 +7,7 @@ import * as iam from 'aws-cdk-lib/aws-iam'; import * as s3 from 'aws-cdk-lib/aws-s3'; import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'; import * as ssm from 'aws-cdk-lib/aws-ssm'; +import { Repository } from 'aws-cdk-lib/aws-ecr'; import { CfnInclude } from 'aws-cdk-lib/cloudformation-include'; import { Construct } from 'constructs'; const path = require('path'); diff --git a/validation_testing/deploy_infra.sh b/validation_testing/deploy_infra.sh index a02961918b..00bcbc6271 100644 --- a/validation_testing/deploy_infra.sh +++ b/validation_testing/deploy_infra.sh @@ -1,10 +1,24 @@ - CONNECTOR_NAME=$1 VALIDATION_TESTING_ROOT=$REPOSITORY_ROOT/validation_testing -# upload connector jar to s3 and update yaml to s3 uri, redirect to /dev/null to not log the s3 path -aws s3 cp $REPOSITORY_ROOT/athena-$CONNECTOR_NAME/target/athena-$CONNECTOR_NAME-2022.47.1.jar "$S3_JARS_BUCKET/" > /dev/null -sed -i "s#CodeUri: \"./target/athena-$CONNECTOR_NAME-2022.47.1.jar\"#CodeUri: \"$S3_JARS_BUCKET/athena-$CONNECTOR_NAME-2022.47.1.jar\"#" $REPOSITORY_ROOT/athena-$CONNECTOR_NAME/athena-$CONNECTOR_NAME.yaml +# ecr repository must be created and an image pushed before the cdk stack is deployed for the lambda to create successfully +# get the AWS account ID from the current roll (for use in ECR repo name) +ACCOUNT_ID="$(aws sts get-caller-identity --query Account --output text)" + +# create the ECR repository +aws ecr create-repository --repository-name athena-federation-repository-$CONNECTOR_NAME --region us-east-1 + +# push the ECR image for the connector to the ECR repository +aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin $ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com +docker build -t athena-federation-repository-$CONNECTOR_NAME $REPOSITORY_ROOT/athena-$CONNECTOR_NAME +docker tag athena-federation-repository-$CONNECTOR_NAME\:latest $ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com/athena-federation-repository-$CONNECTOR_NAME\:latest +docker push $ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com/athena-federation-repository-$CONNECTOR_NAME\:latest + +# update the template to use the correct ImageUri +sed -i "s|292517598671|$ACCOUNT_ID|g" "$REPOSITORY_ROOT/athena-$CONNECTOR_NAME/athena-$CONNECTOR_NAME.yaml" +sed -i "s#\(/athena-federation-repository-$CONNECTOR_NAME:\)[0-9]\{4\}\.[0-9]\{1,2\}\.[0-9]\{1\}#\1latest#" $REPOSITORY_ROOT/athena-$CONNECTOR_NAME/athena-$CONNECTOR_NAME.yaml + +echo "FINISHED PUSHING CONNECTOR IMAGE TO ECR REPOSITORY" # go to cdk dir, build/synth/deploy cd $(dirname $(find . -name ATHENA_INFRA_SPINUP_ROOT))/app; @@ -20,6 +34,4 @@ npm run build; npm run cdk synth; npm run cdk deploy ${CONNECTOR_NAME}CdkStack > /dev/null; -sed -i "s#CodeUri: \"$S3_JARS_BUCKET/athena-$CONNECTOR_NAME-2022.47.1.jar\"#CodeUri: \"./target/athena-$CONNECTOR_NAME-2022.47.1.jar\"#" $REPOSITORY_ROOT/athena-$CONNECTOR_NAME/athena-$CONNECTOR_NAME.yaml - echo "FINISHED DEPLOYING INFRA FOR ${CONNECTOR_NAME}." diff --git a/validation_testing/main.py b/validation_testing/main.py index bf03f13670..9bb8f10274 100644 --- a/validation_testing/main.py +++ b/validation_testing/main.py @@ -19,7 +19,6 @@ def assert_required_env_vars_set(): 'REPOSITORY_ROOT', 'DATABASE_PASSWORD', 'S3_DATA_PATH', - 'S3_JARS_BUCKET', 'SPILL_BUCKET' ] if not all([os.environ.get(env_var) for env_var in required_env_vars]): diff --git a/validation_testing/run_release_tests.sh b/validation_testing/run_release_tests.sh index 5b0a7c815b..47a272903a 100644 --- a/validation_testing/run_release_tests.sh +++ b/validation_testing/run_release_tests.sh @@ -7,9 +7,24 @@ CONNECTOR_NAME=$1 VALIDATION_TESTING_ROOT=$REPOSITORY_ROOT/validation_testing -# upload connector jar to s3 and update yaml to s3 uri, redirect to /dev/null to not log the s3 path -aws s3 cp $REPOSITORY_ROOT/athena-$CONNECTOR_NAME/target/athena-$CONNECTOR_NAME-2022.47.1.jar $S3_JARS_BUCKET > /dev/null -sed -i "s#CodeUri: \"./target/athena-$CONNECTOR_NAME-2022.47.1.jar\"#CodeUri: \"$S3_JARS_BUCKET/athena-$CONNECTOR_NAME-2022.47.1.jar\"#" $REPOSITORY_ROOT/athena-$CONNECTOR_NAME/athena-$CONNECTOR_NAME.yaml +# ecr repository must be created and an image pushed before the cdk stack is deployed for the lambda to create successfully +# get the AWS account ID from the current roll (for use in ECR repo name) +ACCOUNT_ID="$(aws sts get-caller-identity --query Account --output text)" + +# create the ECR repository +aws ecr create-repository --repository-name athena-federation-repository-$CONNECTOR_NAME --region us-east-1 + +# push the ECR image for the connector to the ECR repository +aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin $ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com +docker build -t athena-federation-repository-$CONNECTOR_NAME $REPOSITORY_ROOT/athena-$CONNECTOR_NAME +docker tag athena-federation-repository-$CONNECTOR_NAME\:latest $ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com/athena-federation-repository-$CONNECTOR_NAME\:latest +docker push $ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com/athena-federation-repository-$CONNECTOR_NAME\:latest + +# update the template to use the correct ImageUri +sed -i "s|292517598671|$ACCOUNT_ID|g" "$REPOSITORY_ROOT/athena-$CONNECTOR_NAME/athena-$CONNECTOR_NAME.yaml" +sed -i "s#\(/athena-federation-repository-$CONNECTOR_NAME:\)[0-9]\{4\}\.[0-9]\{1,2\}\.[0-9]\{1\}#\1latest#" $REPOSITORY_ROOT/athena-$CONNECTOR_NAME/athena-$CONNECTOR_NAME.yaml + +echo "FINISHED PUSHING CONNECTOR IMAGE TO ECR REPOSITORY" # go to cdk dir, build/synth/deploy cd $(dirname $(find . -name ATHENA_INFRA_SPINUP_ROOT))/app; @@ -25,8 +40,6 @@ npm run build; npm run cdk synth; npm run cdk deploy ${CONNECTOR_NAME}CdkStack > /dev/null; -sed -i "s#CodeUri: \"$S3_JARS_BUCKET/athena-$CONNECTOR_NAME-2022.47.1.jar\"#CodeUri: \"./target/athena-$CONNECTOR_NAME-2022.47.1.jar\"#" $REPOSITORY_ROOT/athena-$CONNECTOR_NAME/athena-$CONNECTOR_NAME.yaml - echo "FINISHED DEPLOYING INFRA FOR ${CONNECTOR_NAME}." # cd back to validation root @@ -61,6 +74,9 @@ cd $(dirname $(find . -name ATHENA_INFRA_SPINUP_ROOT))/app; # cannot use --force because npm is stripping the flags, so pipe yes through yes | npm run cdk destroy ${CONNECTOR_NAME}CdkStack; +# delete the ecr repository +aws ecr delete-repository --repository-name athena-federation-repository-$CONNECTOR_NAME --force + echo "FINISHED CLEANING UP RESOURCES FOR ${CONNECTOR_NAME}." From 631c590d4ad70a758bced4723e11df8d464d2936 Mon Sep 17 00:00:00 2001 From: Aimery Methena <159072740+aimethed@users.noreply.github.com> Date: Thu, 24 Oct 2024 13:03:24 -0400 Subject: [PATCH 02/28] =?UTF-8?q?update=20bump=5Fconnectors=5Fversion.py?= =?UTF-8?q?=20to=20correctly=20update=20Dockerfile=20and=20=E2=80=A6=20(#2?= =?UTF-8?q?354)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/bump_versions/bump_connectors_version.py | 2 +- tools/bump_versions/common.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/bump_versions/bump_connectors_version.py b/tools/bump_versions/bump_connectors_version.py index d6cd78edd4..8444549524 100755 --- a/tools/bump_versions/bump_connectors_version.py +++ b/tools/bump_versions/bump_connectors_version.py @@ -51,5 +51,5 @@ common.update_yaml(yaml_files, new_version) # Bump the versions in the Dockerfiles - dockerfiles = glob.glob("Dockerfile") + dockerfiles = glob.glob(f"{connector}/Dockerfile") common.update_dockerfile(dockerfiles, new_version) diff --git a/tools/bump_versions/common.py b/tools/bump_versions/common.py index bec31d3038..61b6614bf9 100755 --- a/tools/bump_versions/common.py +++ b/tools/bump_versions/common.py @@ -34,15 +34,15 @@ def output_xml(soup, filename): def update_yaml(yaml_files, new_version): for yml in yaml_files: - subprocess.run(["sed", "-i", f"s/\(SemanticVersion:\s*\).*/\\1{new_version}/", yml]) - subprocess.run(["sed", "-i", f"s/\(CodeUri:.*-\)[0-9]*\.[0-9]*\.[0-9]*\(-\?.*\.jar\)/\\1{new_version}\\2/", yml]) - subprocess.run(["sed", "-i", f"s/\(ImageUri:.*:\)[0-9]*\.[0-9]*\.[0-9]*\(\'\)/\\1{new_version}\\2/", yml]) + subprocess.run(["sed", "-i", '', f"s/\(SemanticVersion:\s*\).*/\\1{new_version}/", yml]) + subprocess.run(["sed", "-i", '', f"s/\(CodeUri:.*-\)[0-9]*\.[0-9]*\.[0-9]*\(-\?.*\.jar\)/\\1{new_version}\\2/", yml]) + subprocess.run(["sed", "-i", '', f"s|\(athena-federation-repository-.*:\)[0-9]*\.[0-9]*\.[0-9]*\(\'\)|\\1{new_version}\\2|", yml]) def update_dockerfile(dockerfiles, new_version): for file in dockerfiles: - subprocess.run(["sed", "-i", f"s/\(COPY\s.*-\)[0-9]*\.[0-9]*\.[0-9]*\(\.jar.*\)/\\1{new_version}\\2/", file]) - subprocess.run(["sed", "-i", f"s/\(RUN\sjar\sxf.*-\)[0-9]*\.[0-9]*\.[0-9]*\(\.jar\)/\\1{new_version}\\2/", file]) + subprocess.run(["sed", "-i", '', f"s|\(target\/.*-\)[0-9]*\.[0-9]*\.[0-9]*|\\1{new_version}|", file]) + subprocess.run(["sed", "-i", '', f"s|\(xf\s*.*-\)[0-9]*\.[0-9]*\.[0-9]*|\\1{new_version}|", file]) def update_project_version(soup, new_version): From 2e874bed11257f5bf6b6564f80c45b8867aaa245 Mon Sep 17 00:00:00 2001 From: Aimery Methena <159072740+aimethed@users.noreply.github.com> Date: Thu, 24 Oct 2024 13:26:57 -0400 Subject: [PATCH 03/28] fix commands to work for linux (#2355) --- tools/bump_versions/common.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/bump_versions/common.py b/tools/bump_versions/common.py index 61b6614bf9..4bc750300d 100755 --- a/tools/bump_versions/common.py +++ b/tools/bump_versions/common.py @@ -34,15 +34,15 @@ def output_xml(soup, filename): def update_yaml(yaml_files, new_version): for yml in yaml_files: - subprocess.run(["sed", "-i", '', f"s/\(SemanticVersion:\s*\).*/\\1{new_version}/", yml]) - subprocess.run(["sed", "-i", '', f"s/\(CodeUri:.*-\)[0-9]*\.[0-9]*\.[0-9]*\(-\?.*\.jar\)/\\1{new_version}\\2/", yml]) - subprocess.run(["sed", "-i", '', f"s|\(athena-federation-repository-.*:\)[0-9]*\.[0-9]*\.[0-9]*\(\'\)|\\1{new_version}\\2|", yml]) + subprocess.run(["sed", "-i", f"s/\(SemanticVersion:\s*\).*/\\1{new_version}/", yml]) + subprocess.run(["sed", "-i", f"s/\(CodeUri:.*-\)[0-9]*\.[0-9]*\.[0-9]*\(-\?.*\.jar\)/\\1{new_version}\\2/", yml]) + subprocess.run(["sed", "-i", f"s|\(athena-federation-repository-.*:\)[0-9]*\.[0-9]*\.[0-9]*\(\'\)|\\1{new_version}\\2|", yml]) def update_dockerfile(dockerfiles, new_version): for file in dockerfiles: - subprocess.run(["sed", "-i", '', f"s|\(target\/.*-\)[0-9]*\.[0-9]*\.[0-9]*|\\1{new_version}|", file]) - subprocess.run(["sed", "-i", '', f"s|\(xf\s*.*-\)[0-9]*\.[0-9]*\.[0-9]*|\\1{new_version}|", file]) + subprocess.run(["sed", "-i", f"s|\(target\/.*-\)[0-9]*\.[0-9]*\.[0-9]*|\\1{new_version}|", file]) + subprocess.run(["sed", "-i", f"s|\(xf\s*.*-\)[0-9]*\.[0-9]*\.[0-9]*|\\1{new_version}|", file]) def update_project_version(soup, new_version): From de1cd60526812baf1fd52f2dbe4ea3f26e1b68ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 06:19:55 +0000 Subject: [PATCH 04/28] build(deps): bump com.google.cloud:google-cloud-storage Bumps [com.google.cloud:google-cloud-storage](https://github.com/googleapis/java-storage) from 2.43.2 to 2.44.1. - [Release notes](https://github.com/googleapis/java-storage/releases) - [Changelog](https://github.com/googleapis/java-storage/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/java-storage/compare/v2.43.2...v2.44.1) --- updated-dependencies: - dependency-name: com.google.cloud:google-cloud-storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- athena-gcs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-gcs/pom.xml b/athena-gcs/pom.xml index 890aded14d..5a5804a3c2 100644 --- a/athena-gcs/pom.xml +++ b/athena-gcs/pom.xml @@ -75,7 +75,7 @@ com.google.cloud google-cloud-storage - 2.43.2 + 2.44.1 From 937b3ac6014b248f1523fa82ec1b36b605769ec8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 06:27:12 +0000 Subject: [PATCH 05/28] build(deps): bump org.apache.maven.plugins:maven-dependency-plugin Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.8.0 to 3.8.1. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.8.0...maven-dependency-plugin-3.8.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- athena-dynamodb/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/athena-dynamodb/pom.xml b/athena-dynamodb/pom.xml index 81b5e92c61..39bf5f9609 100644 --- a/athena-dynamodb/pom.xml +++ b/athena-dynamodb/pom.xml @@ -118,7 +118,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.8.0 + 3.8.1 copy diff --git a/pom.xml b/pom.xml index 210c00139d..a7aad7a600 100644 --- a/pom.xml +++ b/pom.xml @@ -232,7 +232,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.8.0 + 3.8.1 From 6e4896ebf21b8164c215b06b567555129d8bbd82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 06:32:57 +0000 Subject: [PATCH 06/28] build(deps): bump org.junit:junit-bom from 5.11.2 to 5.11.3 Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.11.2 to 5.11.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.2...r5.11.3) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7aad7a600..c8ad0a1fd2 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ org.junit junit-bom - 5.11.2 + 5.11.3 pom import From a6a7686e27aca03f56aeca225d35aa88c6f207c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 06:39:02 +0000 Subject: [PATCH 07/28] build(deps): bump net.java.dev.jna:jna-platform from 5.14.0 to 5.15.0 Bumps [net.java.dev.jna:jna-platform](https://github.com/java-native-access/jna) from 5.14.0 to 5.15.0. - [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md) - [Commits](https://github.com/java-native-access/jna/compare/5.14.0...5.15.0) --- updated-dependencies: - dependency-name: net.java.dev.jna:jna-platform dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- athena-vertica/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-vertica/pom.xml b/athena-vertica/pom.xml index 4e8543e54c..a637ce0266 100644 --- a/athena-vertica/pom.xml +++ b/athena-vertica/pom.xml @@ -25,7 +25,7 @@ net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 org.slf4j From 8a44c7292a1585ead238ac8195c9c304c270e37d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 06:45:07 +0000 Subject: [PATCH 08/28] build(deps): bump software.amazon.awssdk:cloudwatchlogs Bumps software.amazon.awssdk:cloudwatchlogs from 2.28.2 to 2.29.1. --- updated-dependencies: - dependency-name: software.amazon.awssdk:cloudwatchlogs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- athena-cloudwatch/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-cloudwatch/pom.xml b/athena-cloudwatch/pom.xml index 95a34d1d37..4e120487f0 100644 --- a/athena-cloudwatch/pom.xml +++ b/athena-cloudwatch/pom.xml @@ -31,7 +31,7 @@ software.amazon.awssdk cloudwatchlogs - 2.28.2 + 2.29.1 From 4b1ece10f8880bc63d50e811367fa82084978b18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 06:50:54 +0000 Subject: [PATCH 09/28] build(deps): bump org.apache.maven.plugins:maven-checkstyle-plugin Bumps [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.5.0 to 3.6.0. - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.5.0...maven-checkstyle-plugin-3.6.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8ad0a1fd2..be726b8a53 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 3.2.1 1.19.0 - 3.5.0 + 3.6.0 3.6.0 3.3.1 3.10.1 From 75c380d6067ce6dca9a555b2de353146bd26bf12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 06:56:34 +0000 Subject: [PATCH 10/28] build(deps): bump net.snowflake:snowflake-jdbc from 3.19.0 to 3.19.1 Bumps [net.snowflake:snowflake-jdbc](https://github.com/snowflakedb/snowflake-jdbc) from 3.19.0 to 3.19.1. - [Release notes](https://github.com/snowflakedb/snowflake-jdbc/releases) - [Changelog](https://github.com/snowflakedb/snowflake-jdbc/blob/master/CHANGELOG.rst) - [Commits](https://github.com/snowflakedb/snowflake-jdbc/compare/v3.19.0...v3.19.1) --- updated-dependencies: - dependency-name: net.snowflake:snowflake-jdbc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- athena-snowflake/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-snowflake/pom.xml b/athena-snowflake/pom.xml index aec0e7f807..b70e0c99a6 100644 --- a/athena-snowflake/pom.xml +++ b/athena-snowflake/pom.xml @@ -30,7 +30,7 @@ net.snowflake snowflake-jdbc - 3.19.0 + 3.19.1 From 2ba4bf44dcfb1ae0355134c76c235c96bee9ce27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 07:02:47 +0000 Subject: [PATCH 11/28] build(deps): bump aws-sdk-v2.version from 2.28.9 to 2.29.1 Bumps `aws-sdk-v2.version` from 2.28.9 to 2.29.1. Updates `software.amazon.awssdk:apache-client` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:athena` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:glue` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:kms` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:lambda` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:s3` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:secretsmanager` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:sts` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:cloudformation` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:cloudwatch` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:dynamodb` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:dynamodb-enhanced` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:url-connection-client` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:ec2` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:emr` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:rds` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:docdb` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:elasticache` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:elasticsearch` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:redshift` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:redshiftserverless` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:timestreamwrite` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:timestreamquery` from 2.28.9 to 2.29.1 Updates `software.amazon.awssdk:bom` from 2.28.9 to 2.29.1 --- updated-dependencies: - dependency-name: software.amazon.awssdk:apache-client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:athena dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:glue dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:kms dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:lambda dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:secretsmanager dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:sts dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:cloudformation dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:cloudwatch dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:dynamodb dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:dynamodb-enhanced dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:url-connection-client dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:ec2 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:emr dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:rds dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:docdb dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:elasticache dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:elasticsearch dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:redshift dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:redshiftserverless dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:timestreamwrite dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:timestreamquery dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: software.amazon.awssdk:bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index be726b8a53..d823d42ad6 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 11 3.13.0 - 2.28.9 + 2.29.1 1.2.2 1.6.0 1.204.0 From dea9f58bc74a851600ee3759e7846853964ec98b Mon Sep 17 00:00:00 2001 From: VenkatasivareddyTR <110587813+VenkatasivareddyTR@users.noreply.github.com> Date: Wed, 30 Oct 2024 21:52:40 +0530 Subject: [PATCH 12/28] Bug/elasticsearch float issue (#2341) --- .../elasticsearch/ElasticsearchSchemaUtils.java | 6 ++---- .../elasticsearch/ElasticsearchMetadataHandlerTest.java | 8 ++++---- .../elasticsearch/ElasticsearchSchemaUtilsTest.java | 8 ++++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/athena-elasticsearch/src/main/java/com/amazonaws/athena/connectors/elasticsearch/ElasticsearchSchemaUtils.java b/athena-elasticsearch/src/main/java/com/amazonaws/athena/connectors/elasticsearch/ElasticsearchSchemaUtils.java index c6c4aef791..9d28bcfff3 100644 --- a/athena-elasticsearch/src/main/java/com/amazonaws/athena/connectors/elasticsearch/ElasticsearchSchemaUtils.java +++ b/athena-elasticsearch/src/main/java/com/amazonaws/athena/connectors/elasticsearch/ElasticsearchSchemaUtils.java @@ -162,6 +162,8 @@ private static FieldType toFieldType(Map mapping) case "byte": minorType = Types.MinorType.TINYINT; break; + case "float": + case "half_float": case "double": minorType = Types.MinorType.FLOAT8; break; @@ -170,10 +172,6 @@ private static FieldType toFieldType(Map mapping) minorType = Types.MinorType.BIGINT; metadata.put("scaling_factor", mapping.get("scaling_factor").toString()); break; - case "float": - case "half_float": - minorType = Types.MinorType.FLOAT4; - break; case "date": case "date_nanos": minorType = Types.MinorType.DATEMILLI; diff --git a/athena-elasticsearch/src/test/java/com/amazonaws/athena/connectors/elasticsearch/ElasticsearchMetadataHandlerTest.java b/athena-elasticsearch/src/test/java/com/amazonaws/athena/connectors/elasticsearch/ElasticsearchMetadataHandlerTest.java index cddfce30a4..058e52c959 100644 --- a/athena-elasticsearch/src/test/java/com/amazonaws/athena/connectors/elasticsearch/ElasticsearchMetadataHandlerTest.java +++ b/athena-elasticsearch/src/test/java/com/amazonaws/athena/connectors/elasticsearch/ElasticsearchMetadataHandlerTest.java @@ -283,8 +283,8 @@ public void doGetTable() .addField(new Field("myscaled", new FieldType(true, Types.MinorType.BIGINT.getType(), null, ImmutableMap.of("scaling_factor", "10.0")), null)) - .addField("myfloat", Types.MinorType.FLOAT4.getType()) - .addField("myhalf", Types.MinorType.FLOAT4.getType()) + .addField("myfloat", Types.MinorType.FLOAT8.getType()) + .addField("myhalf", Types.MinorType.FLOAT8.getType()) .addField("mydatemilli", Types.MinorType.DATEMILLI.getType()) .addField("mydatenano", Types.MinorType.DATEMILLI.getType()) .addField("myboolean", Types.MinorType.BIT.getType()) @@ -328,10 +328,10 @@ public void doGetTable() " \"type\" : \"double\"\n" + // type: double (FLOAT8) " },\n" + " \"myfloat\" : {\n" + // myfloat: - " \"type\" : \"float\"\n" + // type: float (FLOAT4) + " \"type\" : \"float\"\n" + // type: float (FLOAT8) " },\n" + " \"myhalf\" : {\n" + // myhalf: - " \"type\" : \"half_float\"\n" + // type: half_float (FLOAT4) + " \"type\" : \"half_float\"\n" + // type: half_float (FLOAT8) " },\n" + " \"myinteger\" : {\n" + // myinteger: " \"type\" : \"integer\"\n" + // type: integer (INT) diff --git a/athena-elasticsearch/src/test/java/com/amazonaws/athena/connectors/elasticsearch/ElasticsearchSchemaUtilsTest.java b/athena-elasticsearch/src/test/java/com/amazonaws/athena/connectors/elasticsearch/ElasticsearchSchemaUtilsTest.java index 5ba682800b..0e8096d3cb 100644 --- a/athena-elasticsearch/src/test/java/com/amazonaws/athena/connectors/elasticsearch/ElasticsearchSchemaUtilsTest.java +++ b/athena-elasticsearch/src/test/java/com/amazonaws/athena/connectors/elasticsearch/ElasticsearchSchemaUtilsTest.java @@ -69,8 +69,8 @@ public void setUp() .addField(new Field("myscaled", new FieldType(true, Types.MinorType.BIGINT.getType(), null, ImmutableMap.of("scaling_factor", "10.0")), null)) - .addField("myfloat", Types.MinorType.FLOAT4.getType()) - .addField("myhalf", Types.MinorType.FLOAT4.getType()) + .addField("myfloat", Types.MinorType.FLOAT8.getType()) + .addField("myhalf", Types.MinorType.FLOAT8.getType()) .addField("mydatemilli", Types.MinorType.DATEMILLI.getType()) .addField("mydatenano", Types.MinorType.DATEMILLI.getType()) .addField("myboolean", Types.MinorType.BIT.getType()) @@ -111,10 +111,10 @@ public void setUp() " \"type\" : \"double\"\n" + // type: double (FLOAT8) " },\n" + " \"myfloat\" : {\n" + // myfloat: - " \"type\" : \"float\"\n" + // type: float (FLOAT4) + " \"type\" : \"float\"\n" + // type: float (FLOAT8) " },\n" + " \"myhalf\" : {\n" + // myhalf: - " \"type\" : \"half_float\"\n" + // type: half_float (FLOAT4) + " \"type\" : \"half_float\"\n" + // type: half_float (FLOAT8) " },\n" + " \"myinteger\" : {\n" + // myinteger: " \"type\" : \"integer\"\n" + // type: integer (INT) From 9d655adde2da3f609484eef7e18f0e17df2133a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 06:17:37 +0000 Subject: [PATCH 13/28] build(deps): bump net.snowflake:snowflake-jdbc from 3.19.1 to 3.20.0 Bumps [net.snowflake:snowflake-jdbc](https://github.com/snowflakedb/snowflake-jdbc) from 3.19.1 to 3.20.0. - [Release notes](https://github.com/snowflakedb/snowflake-jdbc/releases) - [Changelog](https://github.com/snowflakedb/snowflake-jdbc/blob/master/CHANGELOG.rst) - [Commits](https://github.com/snowflakedb/snowflake-jdbc/compare/v3.19.1...v3.20.0) --- updated-dependencies: - dependency-name: net.snowflake:snowflake-jdbc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- athena-snowflake/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-snowflake/pom.xml b/athena-snowflake/pom.xml index b70e0c99a6..d4a7fbb3b5 100644 --- a/athena-snowflake/pom.xml +++ b/athena-snowflake/pom.xml @@ -30,7 +30,7 @@ net.snowflake snowflake-jdbc - 3.19.1 + 3.20.0 From ca36d0dd3f2ef1c0fc8c9c2d26e9e9d8421be9b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 06:24:07 +0000 Subject: [PATCH 14/28] build(deps): bump com.clickhouse:clickhouse-jdbc from 0.6.5 to 0.7.1 Bumps [com.clickhouse:clickhouse-jdbc](https://github.com/ClickHouse/clickhouse-java) from 0.6.5 to 0.7.1. - [Release notes](https://github.com/ClickHouse/clickhouse-java/releases) - [Changelog](https://github.com/ClickHouse/clickhouse-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/ClickHouse/clickhouse-java/compare/v0.6.5...v0.7.1) --- updated-dependencies: - dependency-name: com.clickhouse:clickhouse-jdbc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- athena-clickhouse/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-clickhouse/pom.xml b/athena-clickhouse/pom.xml index f909864105..3c1942cbf5 100644 --- a/athena-clickhouse/pom.xml +++ b/athena-clickhouse/pom.xml @@ -22,7 +22,7 @@ com.clickhouse clickhouse-jdbc - 0.6.5 + 0.7.1 all From 26075861553a5c15a247fa725b3ff2d897e16b73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 06:30:12 +0000 Subject: [PATCH 15/28] build(deps): bump gremlinDriverVersion from 3.7.2 to 3.7.3 Bumps `gremlinDriverVersion` from 3.7.2 to 3.7.3. Updates `org.apache.tinkerpop:gremlin-driver` from 3.7.2 to 3.7.3 - [Changelog](https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc) - [Commits](https://github.com/apache/tinkerpop/compare/3.7.2...3.7.3) Updates `org.apache.tinkerpop:tinkergraph-gremlin` from 3.7.2 to 3.7.3 - [Changelog](https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc) - [Commits](https://github.com/apache/tinkerpop/compare/3.7.2...3.7.3) Updates `org.apache.tinkerpop:gremlin-core` from 3.7.2 to 3.7.3 - [Changelog](https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc) - [Commits](https://github.com/apache/tinkerpop/compare/3.7.2...3.7.3) Updates `org.apache.tinkerpop:gremlin-groovy` from 3.7.2 to 3.7.3 - [Changelog](https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc) - [Commits](https://github.com/apache/tinkerpop/compare/3.7.2...3.7.3) --- updated-dependencies: - dependency-name: org.apache.tinkerpop:gremlin-driver dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.tinkerpop:tinkergraph-gremlin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.tinkerpop:gremlin-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.tinkerpop:gremlin-groovy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- athena-neptune/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-neptune/pom.xml b/athena-neptune/pom.xml index e792f13948..18005ef02a 100644 --- a/athena-neptune/pom.xml +++ b/athena-neptune/pom.xml @@ -10,7 +10,7 @@ 2022.47.1 - 3.7.2 + 3.7.3 2.4.0 From 61a0a9f00c4a87bda056369efaabe3c871234972 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 06:36:03 +0000 Subject: [PATCH 16/28] build(deps): bump software.amazon.awssdk:cloudwatchlogs Bumps software.amazon.awssdk:cloudwatchlogs from 2.29.1 to 2.29.6. --- updated-dependencies: - dependency-name: software.amazon.awssdk:cloudwatchlogs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- athena-cloudwatch/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-cloudwatch/pom.xml b/athena-cloudwatch/pom.xml index 4e120487f0..36f11377e7 100644 --- a/athena-cloudwatch/pom.xml +++ b/athena-cloudwatch/pom.xml @@ -31,7 +31,7 @@ software.amazon.awssdk cloudwatchlogs - 2.29.1 + 2.29.6 From 826bbe22b68c1531402001c31d59fe484d3809bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 06:41:54 +0000 Subject: [PATCH 17/28] build(deps): bump fasterxml.jackson.version from 2.18.0 to 2.18.1 Bumps `fasterxml.jackson.version` from 2.18.0 to 2.18.1. Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.18.0 to 2.18.1 Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-cbor` from 2.18.0 to 2.18.1 - [Commits](https://github.com/FasterXML/jackson-dataformats-binary/compare/jackson-dataformats-binary-2.18.0...jackson-dataformats-binary-2.18.1) Updates `com.fasterxml.jackson.core:jackson-core` from 2.18.0 to 2.18.1 - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.18.0...jackson-core-2.18.1) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.18.0 to 2.18.1 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.18.0 to 2.18.1 - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d823d42ad6..7f2230123e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 3.26.3 7.10.2 - 2.18.0 + 2.18.1 3.5.1 2.24.1 13.0.0 From 2b07ec7e8d9a2484990fc789dcde4568b03f07d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 06:48:02 +0000 Subject: [PATCH 18/28] build(deps): bump surefire.failsafe.version from 3.5.1 to 3.5.2 Bumps `surefire.failsafe.version` from 3.5.1 to 3.5.2. Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.5.1 to 3.5.2 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2) Updates `org.apache.maven.plugins:maven-failsafe-plugin` from 3.5.1 to 3.5.2 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f2230123e..7179d3ea94 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 7.10.2 2.18.1 - 3.5.1 + 3.5.2 2.24.1 13.0.0 33.3.1-jre From d5c90de753eb700c2f50d8cc1e5e907571f475d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 06:54:29 +0000 Subject: [PATCH 19/28] build(deps): bump io.lettuce:lettuce-core Bumps [io.lettuce:lettuce-core](https://github.com/lettuce-io/lettuce-core) from 6.4.0.RELEASE to 6.5.0.RELEASE. - [Release notes](https://github.com/lettuce-io/lettuce-core/releases) - [Changelog](https://github.com/redis/lettuce/blob/main/RELEASE-NOTES.md) - [Commits](https://github.com/lettuce-io/lettuce-core/compare/6.4.0.RELEASE...6.5.0.RELEASE) --- updated-dependencies: - dependency-name: io.lettuce:lettuce-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- athena-redis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-redis/pom.xml b/athena-redis/pom.xml index 20dace645e..72f9c2ced1 100644 --- a/athena-redis/pom.xml +++ b/athena-redis/pom.xml @@ -25,7 +25,7 @@ io.lettuce lettuce-core - 6.4.0.RELEASE + 6.5.0.RELEASE org.slf4j From 1007df621f8f99b7438ec80b4eb99947ceda8eb9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 07:00:38 +0000 Subject: [PATCH 20/28] build(deps): bump aws-sdk-v2.version from 2.29.1 to 2.29.6 Bumps `aws-sdk-v2.version` from 2.29.1 to 2.29.6. Updates `software.amazon.awssdk:apache-client` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:athena` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:glue` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:kms` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:lambda` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:s3` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:secretsmanager` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:sts` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:cloudformation` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:cloudwatch` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:dynamodb` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:dynamodb-enhanced` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:url-connection-client` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:ec2` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:emr` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:rds` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:docdb` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:elasticache` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:elasticsearch` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:redshift` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:redshiftserverless` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:timestreamwrite` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:timestreamquery` from 2.29.1 to 2.29.6 Updates `software.amazon.awssdk:bom` from 2.29.1 to 2.29.6 --- updated-dependencies: - dependency-name: software.amazon.awssdk:apache-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:athena dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:glue dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:kms dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:lambda dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:secretsmanager dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sts dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:cloudformation dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:cloudwatch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:dynamodb dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:dynamodb-enhanced dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:url-connection-client dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:ec2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:emr dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:rds dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:docdb dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:elasticache dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:elasticsearch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:redshift dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:redshiftserverless dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:timestreamwrite dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:timestreamquery dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7179d3ea94..fb174fe73a 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 11 3.13.0 - 2.29.1 + 2.29.6 1.2.2 1.6.0 1.204.0 From f2c67fef80f9410b6b05bfe4417e6e2f0a3bafb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 07:06:28 +0000 Subject: [PATCH 21/28] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.10.1 to 3.11.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.10.1...maven-javadoc-plugin-3.11.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb174fe73a..b3c7e54477 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 3.6.0 3.6.0 3.3.1 - 3.10.1 + 3.11.1 3.4.2 none From 9ebc772b7cb0a843641309eecde68b2faf8b5955 Mon Sep 17 00:00:00 2001 From: Trianz-Akshay <108925344+Trianz-Akshay@users.noreply.github.com> Date: Wed, 6 Nov 2024 20:17:17 +0530 Subject: [PATCH 22/28] Issue 2326 - Timestamp constraint in Cloudera Hive connector (#2353) --- .../cloudera/HiveQueryStringBuilder.java | 20 ++++++++++ .../cloudera/HiveRecordHandlerTest.java | 37 +++++++++++++++++++ .../jdbc/manager/JdbcSplitQueryBuilder.java | 4 +- .../saphana/SaphanaQueryStringBuilder.java | 2 +- 4 files changed, 60 insertions(+), 3 deletions(-) diff --git a/athena-cloudera-hive/src/main/java/com/amazonaws/athena/connectors/cloudera/HiveQueryStringBuilder.java b/athena-cloudera-hive/src/main/java/com/amazonaws/athena/connectors/cloudera/HiveQueryStringBuilder.java index 96d4e0f360..a2a10d985a 100644 --- a/athena-cloudera-hive/src/main/java/com/amazonaws/athena/connectors/cloudera/HiveQueryStringBuilder.java +++ b/athena-cloudera-hive/src/main/java/com/amazonaws/athena/connectors/cloudera/HiveQueryStringBuilder.java @@ -22,7 +22,10 @@ import com.amazonaws.athena.connector.lambda.domain.Split; import com.amazonaws.athena.connectors.jdbc.manager.FederationExpressionParser; import com.amazonaws.athena.connectors.jdbc.manager.JdbcSplitQueryBuilder; +import com.amazonaws.athena.connectors.jdbc.manager.TypeAndValue; import com.google.common.base.Strings; +import org.apache.arrow.vector.types.Types; +import org.apache.arrow.vector.types.pojo.ArrowType; import java.util.Collections; import java.util.List; @@ -56,4 +59,21 @@ protected List getPartitionWhereClauses(Split split) } return Collections.emptyList(); } + + protected String toPredicate(String columnName, String operator, Object value, ArrowType type, + List accumulator) + { + Types.MinorType minorType = Types.getMinorTypeForArrowType(type); + if (minorType.equals(Types.MinorType.DATEMILLI) && isOperatorEquals(operator)) { + accumulator.add(new TypeAndValue(type, value)); + return quote(columnName) + " " + operator + " cast(? as timestamp)"; + } + // Default to parent's behavior + return super.toPredicate(columnName, operator, value, type, accumulator); + } + + private boolean isOperatorEquals(String operator) + { + return operator.equals("="); + } } diff --git a/athena-cloudera-hive/src/test/java/com/amazonaws/athena/connectors/cloudera/HiveRecordHandlerTest.java b/athena-cloudera-hive/src/test/java/com/amazonaws/athena/connectors/cloudera/HiveRecordHandlerTest.java index 108474f096..cd1dba8155 100644 --- a/athena-cloudera-hive/src/test/java/com/amazonaws/athena/connectors/cloudera/HiveRecordHandlerTest.java +++ b/athena-cloudera-hive/src/test/java/com/amazonaws/athena/connectors/cloudera/HiveRecordHandlerTest.java @@ -51,6 +51,10 @@ import java.sql.Date; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.sql.Timestamp; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; import java.util.Collections; import java.util.concurrent.TimeUnit; @@ -136,4 +140,37 @@ public void buildSplitSql() Mockito.verify(preparedStatement, Mockito.times(1)) .setDate(1, expectedDate); } + + @Test + public void buildSplitSqlTimestamp() + throws SQLException + { + TableName tableName = new TableName("testSchema", "testTable"); + + SchemaBuilder schemaBuilder = SchemaBuilder.newBuilder(); + schemaBuilder.addField(FieldBuilder.newBuilder("testCol1", Types.MinorType.DATEMILLI.getType()).build()); + schemaBuilder.addField(FieldBuilder.newBuilder("partition", Types.MinorType.VARCHAR.getType()).build()); + Schema schema = schemaBuilder.build(); + + Split split = Mockito.mock(Split.class); + Mockito.when(split.getProperties()).thenReturn(Collections.singletonMap("partition", "p0")); + Mockito.when(split.getProperty(Mockito.eq("partition"))).thenReturn("p0"); + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime timestamp = LocalDateTime.parse("2024-10-03 12:34:56", formatter); + ValueSet valueSet2 = getSingleValueSet(timestamp); + Constraints constraints = Mockito.mock(Constraints.class); + Mockito.when(constraints.getSummary()).thenReturn(new ImmutableMap.Builder() + .put("testCol1", valueSet2) + .build()); + PreparedStatement expectedPreparedStatement = Mockito.mock(PreparedStatement.class); + Mockito.when(this.connection.prepareStatement(nullable(String.class))).thenReturn(expectedPreparedStatement); + PreparedStatement preparedStatement = this.hiveRecordHandler.buildSplitSql(this.connection, "testCatalogName", tableName, schema, constraints, split); + Assert.assertEquals(expectedPreparedStatement, preparedStatement); + LocalDateTime timestampExp = LocalDateTime.parse("2024-10-03 12:34:56", formatter); + Timestamp expectedTimestamp = new Timestamp(timestamp.toInstant(ZoneOffset.UTC).toEpochMilli()); + Assert.assertEquals(expectedPreparedStatement, preparedStatement); + Mockito.verify(preparedStatement, Mockito.times(1)) + .setTimestamp(1, expectedTimestamp); + } } diff --git a/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/JdbcSplitQueryBuilder.java b/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/JdbcSplitQueryBuilder.java index a532d02aa2..ad71e20ad1 100644 --- a/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/JdbcSplitQueryBuilder.java +++ b/athena-jdbc/src/main/java/com/amazonaws/athena/connectors/jdbc/manager/JdbcSplitQueryBuilder.java @@ -336,8 +336,8 @@ else if (singleValues.size() > 1) { return "(" + Joiner.on(" OR ").join(disjuncts) + ")"; } - private String toPredicate(String columnName, String operator, Object value, ArrowType type, - List accumulator) + protected String toPredicate(String columnName, String operator, Object value, ArrowType type, + List accumulator) { accumulator.add(new TypeAndValue(type, value)); return quote(columnName) + " " + operator + " ?"; diff --git a/athena-saphana/src/main/java/com/amazonaws/athena/connectors/saphana/SaphanaQueryStringBuilder.java b/athena-saphana/src/main/java/com/amazonaws/athena/connectors/saphana/SaphanaQueryStringBuilder.java index 16ec948679..bdb70c367e 100644 --- a/athena-saphana/src/main/java/com/amazonaws/athena/connectors/saphana/SaphanaQueryStringBuilder.java +++ b/athena-saphana/src/main/java/com/amazonaws/athena/connectors/saphana/SaphanaQueryStringBuilder.java @@ -350,7 +350,7 @@ else if (singleValues.size() > 1) { return "(" + Joiner.on(" OR ").join(disjuncts) + ")"; } - private String toPredicate(String columnName, String operator, Object value, ArrowType type, + protected String toPredicate(String columnName, String operator, Object value, ArrowType type, List accumulator) { accumulator.add(new TypeAndValue(type, value)); From 18011a96144df594f8f21a27b02f8e1c66ad17ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 06:17:28 +0000 Subject: [PATCH 23/28] build(deps): bump aws-sdk-v2.version from 2.29.6 to 2.29.9 Bumps `aws-sdk-v2.version` from 2.29.6 to 2.29.9. Updates `software.amazon.awssdk:apache-client` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:athena` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:glue` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:kms` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:lambda` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:s3` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:secretsmanager` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:sts` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:cloudformation` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:cloudwatch` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:dynamodb` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:dynamodb-enhanced` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:url-connection-client` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:ec2` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:emr` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:rds` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:docdb` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:elasticache` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:elasticsearch` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:redshift` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:redshiftserverless` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:timestreamwrite` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:timestreamquery` from 2.29.6 to 2.29.9 Updates `software.amazon.awssdk:bom` from 2.29.6 to 2.29.9 --- updated-dependencies: - dependency-name: software.amazon.awssdk:apache-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:athena dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:glue dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:kms dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:lambda dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:secretsmanager dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sts dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:cloudformation dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:cloudwatch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:dynamodb dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:dynamodb-enhanced dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:url-connection-client dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:ec2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:emr dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:rds dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:docdb dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:elasticache dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:elasticsearch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:redshift dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:redshiftserverless dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:timestreamwrite dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:timestreamquery dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3c7e54477..a0892ff62e 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 11 3.13.0 - 2.29.6 + 2.29.9 1.2.2 1.6.0 1.204.0 From 37ee44f1ee0635016cbb1a84e7c362d896ad9439 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 06:23:27 +0000 Subject: [PATCH 24/28] build(deps): bump com.oracle.database.jdbc:ojdbc8 Bumps com.oracle.database.jdbc:ojdbc8 from 23.5.0.24.07 to 23.6.0.24.10. --- updated-dependencies: - dependency-name: com.oracle.database.jdbc:ojdbc8 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- athena-oracle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-oracle/pom.xml b/athena-oracle/pom.xml index e727fd5e45..6eb10809f4 100644 --- a/athena-oracle/pom.xml +++ b/athena-oracle/pom.xml @@ -30,7 +30,7 @@ com.oracle.database.jdbc ojdbc8 - 23.5.0.24.07 + 23.6.0.24.10 From c3e12c5256d369c69a8ac0a084f92571b5f02ed4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 06:29:13 +0000 Subject: [PATCH 25/28] build(deps): bump org.eclipse.rdf4j:rdf4j-repository-sparql Bumps org.eclipse.rdf4j:rdf4j-repository-sparql from 5.0.2 to 5.0.3. --- updated-dependencies: - dependency-name: org.eclipse.rdf4j:rdf4j-repository-sparql dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- athena-neptune/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-neptune/pom.xml b/athena-neptune/pom.xml index 18005ef02a..909f68c5aa 100644 --- a/athena-neptune/pom.xml +++ b/athena-neptune/pom.xml @@ -124,7 +124,7 @@ org.eclipse.rdf4j rdf4j-repository-sparql - 5.0.2 + 5.0.3 org.slf4j From f7a74c7641c58ec538413b8971a47926691d9b83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 06:34:58 +0000 Subject: [PATCH 26/28] build(deps): bump com.clickhouse:clickhouse-jdbc Bumps [com.clickhouse:clickhouse-jdbc](https://github.com/ClickHouse/clickhouse-java) from 0.7.1 to 0.7.1-patch1. - [Release notes](https://github.com/ClickHouse/clickhouse-java/releases) - [Changelog](https://github.com/ClickHouse/clickhouse-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/ClickHouse/clickhouse-java/compare/v0.7.1...v0.7.1-patch1) --- updated-dependencies: - dependency-name: com.clickhouse:clickhouse-jdbc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- athena-clickhouse/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-clickhouse/pom.xml b/athena-clickhouse/pom.xml index 3c1942cbf5..18df708cb6 100644 --- a/athena-clickhouse/pom.xml +++ b/athena-clickhouse/pom.xml @@ -22,7 +22,7 @@ com.clickhouse clickhouse-jdbc - 0.7.1 + 0.7.1-patch1 all From 2c80e24f9b00e11d0c892809b7990f7a7cae3a92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 06:40:55 +0000 Subject: [PATCH 27/28] build(deps-dev): bump nl.jqno.equalsverifier:equalsverifier Bumps [nl.jqno.equalsverifier:equalsverifier](https://github.com/jqno/equalsverifier) from 3.17.1 to 3.17.3. - [Release notes](https://github.com/jqno/equalsverifier/releases) - [Changelog](https://github.com/jqno/equalsverifier/blob/main/CHANGELOG.md) - [Commits](https://github.com/jqno/equalsverifier/compare/equalsverifier-3.17.1...equalsverifier-3.17.3) --- updated-dependencies: - dependency-name: nl.jqno.equalsverifier:equalsverifier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- athena-google-bigquery/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-google-bigquery/pom.xml b/athena-google-bigquery/pom.xml index 7eb4561080..24ae94785c 100644 --- a/athena-google-bigquery/pom.xml +++ b/athena-google-bigquery/pom.xml @@ -66,7 +66,7 @@ nl.jqno.equalsverifier equalsverifier - 3.17.1 + 3.17.3 test From f3bdd8b1042de963c1a70b17c6cea17b72aab140 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 06:46:50 +0000 Subject: [PATCH 28/28] build(deps): bump software.amazon.awssdk:cloudwatchlogs Bumps software.amazon.awssdk:cloudwatchlogs from 2.29.6 to 2.29.9. --- updated-dependencies: - dependency-name: software.amazon.awssdk:cloudwatchlogs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- athena-cloudwatch/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athena-cloudwatch/pom.xml b/athena-cloudwatch/pom.xml index 36f11377e7..d49af55793 100644 --- a/athena-cloudwatch/pom.xml +++ b/athena-cloudwatch/pom.xml @@ -31,7 +31,7 @@ software.amazon.awssdk cloudwatchlogs - 2.29.6 + 2.29.9