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/09/15 16:21:27 UTC
(asterixdb) 04/04: Merge branch 'gerrit/morpheus' into '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 fee7a6e30e4169bc1f4b2c23c0ea466b86cfdfa3
Merge: 24f13dc670 cded915831
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sun Sep 13 14:18:55 2026 -0400

    Merge branch 'gerrit/morpheus' into 'master'
    
     * [NO ISSUE][MISC] Advance the AWS SDK to 2.54.17 (MB-73268)
     * [NO ISSUE][MISC] Advance netty to 4.1.138.Final (MB-73268)
    
    netty.tcnative.version is pinned here, ahead of what netty 4.1.137
    declared; 4.1.138 declares 2.0.84.Final, so the pin moves with it rather
    than holding tcnative back.
    
    Co-Authored-By: Claude Opus 5 <no...@anthropic.com>
    Ext-ref: MB-73268
    Change-Id: I8fc6ae20ddb95f0e4691dd9ff3274396f62dcd83

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

diff --cc asterixdb/pom.xml
index b6876b201f,93e58fe538..4fb9c664ec
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -104,11 -98,6 +104,11 @@@
      <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.54.14</awsjavasdk.version>
++    <awsjavasdk.version>2.54.17</awsjavasdk.version>
 +    <!-- @derived-from: software.amazon.awssdk:aws-sdk-java-pom:${awsjavasdk.version}#awscrt.version -->
 +    <awsjavasdk.crt.version>0.48.4</awsjavasdk.crt.version>
 +
      <azureblobjavasdk.version>12.35.1</azureblobjavasdk.version>
      <azurecommonjavasdk.version>12.34.1</azurecommonjavasdk.version>
      <azureidentity.version>1.18.6</azureidentity.version>
diff --cc hyracks-fullstack/pom.xml
index bf8751d646,02e97aeee8..c144616a00
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -76,17 -81,7 +76,17 @@@
      <jackson.version>2.22.2</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.137.Final</netty.version>
-     <netty.tcnative.version>2.0.83.Final</netty.tcnative.version>
+     <netty.version>4.1.138.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.54.14</awsjavasdk.version>
++    <awsjavasdk.version>2.54.17</awsjavasdk.version>
 +
 +    <!-- keep in sync with asterixdb/pom.xml -->
 +    <google-cloud-storage.version>2.73.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.75.0</google-cloud-core.version>
  
      <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
      <implementation.url>https://asterixdb.apache.org/</implementation.url>