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 bd74cd2d7406329abe29440ca58666ff7698b430 Merge: 261ff9a02c 21d2acb94a Author: Michael Blow <[email protected]> AuthorDate: Fri Jan 12 21:15:51 2024 -0500 Merge branch 'gerrit/neo' into 'gerrit/trinity' Change-Id: Idb6b5126d34da11a358a3ee163623e47bf5051c6 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 +++++++++-- 5 files changed, 132 insertions(+), 160 deletions(-) diff --cc asterixdb/pom.xml index b41a5e7185,e6ae8ceb5b..196231d104 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -87,17 -86,16 +87,17 @@@ <hyracks.version>0.3.8.2-SNAPSHOT</hyracks.version> <hadoop.version>3.3.6</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> - <log4j.version>2.19.0</log4j.version> + <log4j.version>2.22.1</log4j.version> <awsjavasdk.version>2.17.218</awsjavasdk.version> <parquet.version>1.12.3</parquet.version> - <hadoop-awsjavasdk.version>1.12.402</hadoop-awsjavasdk.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> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url>
