This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit ddd024fd1deba18da9b99dd5bbd4c6ea03482490 Merge: 813c15b324 5aa9a23240 Author: Michael Blow <[email protected]> AuthorDate: Tue Nov 26 23:34:01 2024 -0500 Merge branch 'gerrit/trinity' into 'gerrit/goldfish' Ext-ref: MB-64327 Change-Id: I00535f7e759863d6efa11923b9b99c27611edd9c asterixdb/pom.xml | 2 +- .../appended-resources/supplemental-models.xml | 36 ++++++++++------------ ...-library-for-java_refs_tags_v1.17.1_LICENSE.txt | 21 +++++++++++++ ...e-sdk-for-java_azure-identity_1.9.0_LICENSE.txt | 21 ------------- ...ava_refs_tags_azure-identity_1.13.3_NOTICE.txt} | 22 ++++++++++++- 5 files changed, 59 insertions(+), 43 deletions(-) diff --cc asterixdb/pom.xml index cb01868e36,197d869148..374a717833 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -100,12 -93,11 +100,12 @@@ <hadoop-awsjavasdk.version>1.12.637</hadoop-awsjavasdk.version> <azureblobjavasdk.version>12.25.1</azureblobjavasdk.version> <azurecommonjavasdk.version>12.24.1</azurecommonjavasdk.version> - <azureidentity.version>1.13.1</azureidentity.version> + <azureidentity.version>1.13.3</azureidentity.version> <azuredatalakejavasdk.version>12.18.1</azuredatalakejavasdk.version> - <gcsjavasdk.version>2.26.0</gcsjavasdk.version> + <gcsjavasdk.version>2.40.1</gcsjavasdk.version> <hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version> <hadoop-gcs.version>hadoop3-2.2.6</hadoop-gcs.version> + <protobuf-java.version>3.23.2</protobuf-java.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url>
