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 5aa9a2324061c2ce87106f7800f3af46a950e203
Merge: 52b8df6313 6485f14791
Author: Michael Blow <[email protected]>
AuthorDate: Tue Nov 26 21:13:40 2024 -0500

    Merge branch 'gerrit/neo' into 'gerrit/trinity'
    
    Ext-ref: MB-64327
    Change-Id: Ie142ac3869c354f2313d63f23dbcca57d1e61af0

 asterixdb/pom.xml                                  |  2 +-
 .../appended-resources/supplemental-models.xml     | 42 ++++++++++------------
 ...-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, 62 insertions(+), 46 deletions(-)

diff --cc asterixdb/pom.xml
index 2c241626d8,dd9c7d8d74..197d869148
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -83,17 -82,17 +83,17 @@@
      <skip-npm-touch.stage>none</skip-npm-touch.stage>
  
      <!-- Versions under dependencymanagement or used in many projects via 
properties -->
 -    <algebricks.version>0.3.8.2-SNAPSHOT</algebricks.version>
 -    <hyracks.version>0.3.8.2-SNAPSHOT</hyracks.version>
 +    <algebricks.version>0.3.8.3-SNAPSHOT</algebricks.version>
 +    <hyracks.version>0.3.8.3-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.23.3</awsjavasdk.version>
      <parquet.version>1.12.3</parquet.version>
 -    <hadoop-awsjavasdk.version>1.12.402</hadoop-awsjavasdk.version>
 +    <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.11.1</azureidentity.version>
+     <azureidentity.version>1.13.3</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>

Reply via email to