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 39aceec2ae7c472b3b5013c9add95e88099dea6b Merge: 6643eecca9 bd74cd2d74 Author: Michael Blow <[email protected]> AuthorDate: Sat Jan 13 17:00:49 2024 -0500 Merge branch 'gerrit/trinity' into 'master' Change-Id: I08529e4443bed36ab7d77dd53e4ad53e760515d9 asterixdb/asterix-server/pom.xml | 6 +- asterixdb/pom.xml | 8 +- .../appended-resources/supplemental-models.xml | 180 +++++---------------- ....com_Azure_azure-sdk-for-java_main_LICENSE.txt} | 0 ...t.com_Azure_azure-sdk-for-java_main_NOTICE.txt} | 98 +++++++++-- .../hyracks/maven/license/GenerateFileMojo.java | 5 - 6 files changed, 132 insertions(+), 165 deletions(-) diff --cc asterixdb/pom.xml index 27efc8821d,196231d104..0c03ab7b33 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -91,14 -88,13 +91,14 @@@ <hadoop.version>3.3.6</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.22.1</log4j.version> - <awsjavasdk.version>2.17.218</awsjavasdk.version> + <awsjavasdk.version>2.20.135</awsjavasdk.version> + <awsjavasdk.crt.version>0.27.1</awsjavasdk.crt.version> <parquet.version>1.12.3</parquet.version> <hadoop-awsjavasdk.version>1.12.572</hadoop-awsjavasdk.version> - <azureblobjavasdk.version>12.22.0</azureblobjavasdk.version> - <azurecommonjavasdk.version>12.21.0</azurecommonjavasdk.version> - <azureidentity.version>1.9.0</azureidentity.version> - <azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version> + <azureblobjavasdk.version>12.25.1</azureblobjavasdk.version> + <azurecommonjavasdk.version>12.24.1</azurecommonjavasdk.version> + <azureidentity.version>1.11.1</azureidentity.version> + <azuredatalakejavasdk.version>12.18.1</azuredatalakejavasdk.version> <gcsjavasdk.version>2.26.0</gcsjavasdk.version> <hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version> <hadoop-gcs.version>hadoop3-2.2.6</hadoop-gcs.version>
