You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2026/10/12 01:20:57 UTC

(asterixdb) 04/04: Merge branch 'gerrit/morpheus' into 'gerrit/master'

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 8bc4ee5fe3937ebe1134c8c7e171a0dc9b201f7e
Merge: faf9d81c3b 75cc96ced4
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sun Oct 11 16:41:12 2026 -0400

    Merge branch 'gerrit/morpheus' into 'gerrit/master'
    
     * [NO ISSUE][MISC] Advance awssdk and stax2-api (MB-73268)
     * [NO ISSUE][MISC] Advance azure storage SDK (MB-73268)
    
    awsjavasdk.version also moves in hyracks-fullstack/pom.xml, which master
    keeps in sync with asterixdb/pom.xml.
    
    Ext-ref: MB-73268
    Generated-by: Claude Opus 5.5 <no...@anthropic.com>
    Change-Id: I55c668cc892300ba7c6738c89a46353db8013b81

 asterixdb/pom.xml         | 13 ++++++++-----
 hyracks-fullstack/pom.xml |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --cc asterixdb/pom.xml
index 764e8a0ef3,0903814cc3..eaf7d46528
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -104,15 -98,13 +104,18 @@@
      <parquet.version>1.18.1</parquet.version> <!-- NOTICE: please update transitives from parquet below on any change -->
      <hadoop-awsjavasdk.version>1.12.797</hadoop-awsjavasdk.version>
  
 +    <!-- keep in sync with hyracks-fullstack/pom.xml -->
-     <awsjavasdk.version>2.55.13</awsjavasdk.version>
++    <awsjavasdk.version>2.55.14</awsjavasdk.version>
 +    <!-- @derived-from: software.amazon.awssdk:aws-sdk-java-pom:${awsjavasdk.version}#awscrt.version -->
 +    <awsjavasdk.crt.version>0.48.5</awsjavasdk.crt.version>
 +
-     <azureblobjavasdk.version>12.35.2</azureblobjavasdk.version>
-     <azurecommonjavasdk.version>12.34.2</azurecommonjavasdk.version>
+     <!-- azure-storage-blob vendors relocated Apache Arrow (arrow-format) and FlatBuffers
+          (flatbuffers-java) sources, listed in its shade-apache-arrow-format profile; review the
+          license accounting for them whenever this version changes. -->
+     <azureblobjavasdk.version>12.36.0</azureblobjavasdk.version>
+     <azurecommonjavasdk.version>12.35.0</azurecommonjavasdk.version>
      <azureidentity.version>1.18.7</azureidentity.version>
-     <azuredatalakejavasdk.version>12.28.2</azuredatalakejavasdk.version>
+     <azuredatalakejavasdk.version>12.29.0</azuredatalakejavasdk.version>
      <azurecore.version>1.60.0</azurecore.version>
      <azurecorehttpnetty.version>1.16.8</azurecorehttpnetty.version>
  
diff --cc hyracks-fullstack/pom.xml
index 6b166d9a9c,5f136e88b2..bd4f97e966
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -76,20 -81,7 +76,20 @@@
      <jackson.version>2.22.3</jackson.version>
      <jackson-annotations.version>2.22</jackson-annotations.version>
      <jackson-databind.version>${jackson.version}</jackson-databind.version>
 +    <!-- 4.2 is a new netty generation; stay on the 4.1.x line (patch updates only) -->
      <netty.version>4.1.139.Final</netty.version>
 +    <netty.tcnative.version>2.0.84.Final</netty.tcnative.version>
 +    <asm.version>9.10.1</asm.version>
 +    <!-- keep in sync with asterixdb/pom.xml -->
-     <awsjavasdk.version>2.55.13</awsjavasdk.version>
++    <awsjavasdk.version>2.55.14</awsjavasdk.version>
 +
 +    <!-- keep in sync with asterixdb/pom.xml -->
 +    <google-cloud-storage.version>2.75.0</google-cloud-storage.version>
 +    <!-- @derived-from: com.google.cloud:google-cloud-storage:${google-cloud-storage.version}#dep:google-cloud-core -->
 +    <google-cloud-core.version>2.77.0</google-cloud-core.version>
 +
 +    <!-- keep in sync with asterixdb/pom.xml -->
 +    <azurecore.version>1.60.0</azurecore.version>
  
      <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
      <implementation.url>https://asterixdb.apache.org/</implementation.url>