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

[mb...@apache.org]

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 f936a3d935d80a722216ca3c8e922f5738f07009
Merge: bdcec57318 ef12db70c2
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sun Sep 6 12:15:18 2026 -0400

    Merge branch 'gerrit/morpheus' into 'master'
    
     * [NO ISSUE][MISC] Advance parquet and awssdk (MB-73268)
    
    The property block conflicted because master has restructured it: master
    carries avro.version, keeps awsjavasdk.version in its own stanza further
    down, and does not declare s3mock.version at all. Resolved by keeping
    master's structure and applying only the version moves to master's own
    declarations, rather than taking the incoming block -- which would have
    left two awsjavasdk.version declarations.
    
    s3mock.version is deliberately not brought over. The branches use
    different mocks: morpheus takes com.adobe.testing:s3mock at
    ${s3mock.version}, while master pins s3mock-testcontainers 4.12.4 with
    an @locked note that s3mock 5.x needs testcontainers 2.x, incompatible
    with the kafka/postgresql/azure 1.x modules. The property is
    unreferenced on master and 5.x is ruled out there.
    
    awsjavasdk.crt.version is annotated @derived-from the awssdk BOM, so it
    was re-derived rather than assumed: aws-sdk-java-pom declares
    awscrt.version 0.48.4 at both 2.54.11 and 2.54.13, so it stays put.
    
    Per the NOTICE on parquet.version, the pinned transitives were checked
    against parquet 1.18.1: it declares zstd-jni.version 1.5.7-15, which is
    what the merge brings; aircompressor 2.0.3 and commons-pool 1.6 are
    unchanged and match morpheus.
    
    Co-Authored-By: Claude Opus 5 <no...@anthropic.com>
    Change-Id: Icd84d2f67abff4c3744407aeeadcbeee3a4cb3d7
    Ext-ref: MB-73268

 asterixdb/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --cc asterixdb/pom.xml
index 0d30542800,b871a59191..d1b4cefb09
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -81,33 -81,23 +81,33 @@@
      <shim.stage>none</shim.stage>
      <pytestlib.stage>none</pytestlib.stage>
      <skip-npm-touch.stage>none</skip-npm-touch.stage>
 +    <azurite.npm.install.stage>none</azurite.npm.install.stage>
 +    <azurite.install.stage>none</azurite.install.stage>
 +    <azurite.stage>none</azurite.stage>
 +    <gcs.download.stage>none</gcs.download.stage>
 +    <gcs.install.stage>none</gcs.install.stage>
 +    <gcs.stage>none</gcs.stage>
  
      <!-- Versions under dependencymanagement or used in many projects via properties -->
 -    <algebricks.version>0.3.8.3-SNAPSHOT</algebricks.version>
 -    <hyracks.version>0.3.8.3-SNAPSHOT</hyracks.version>
 -    <!-- hadoop's S3A initialises against the awssdk it was built against (3.4.3 reads
 -         ChecksumAlgorithm.CRC64_NVME, added in awssdk 2.30), so the two must move
 -         together: advancing hadoop alone throws NoSuchFieldError on the thread
 -         compiling the query, which halts the JVM. -->
 -    <!-- @pinned-with: ${awsjavasdk.version} -->
 -    <hadoop.version>3.4.3</hadoop.version>
 +    <!-- @locked: keep in sync across all testcontainers modules; 2.x not yet available for kafka/postgresql/azure -->
 +    <testcontainers.version>1.21.4</testcontainers.version>
 +    <algebricks.version>0.3.10-SNAPSHOT</algebricks.version>
 +    <hyracks.version>0.3.10-SNAPSHOT</hyracks.version>
 +    <!-- When moving past 3.5.0, check whether the release includes HADOOP-19906 (fixed in 3.4.4,
 +         3.5.1 and 3.6.0), which restores Subject propagation to child threads on JDK 22+. The
 +         single-threaded input listing forced in HDFSUtils#configureHadoopAuthentication is a
 +         workaround for its absence and should be removed at that point. -->
 +    <hadoop.version>3.5.0</hadoop.version>
      <jacoco.version>0.7.6.201602180812</jacoco.version>
      <log4j.version>2.26.1</log4j.version>
 -    <awsjavasdk.version>2.54.13</awsjavasdk.version>
 -    <s3mock.version>5.2.0</s3mock.version>
 +    <avro.version>1.12.2</avro.version>
-     <parquet.version>1.18.0</parquet.version> <!-- NOTICE: please update transitives from parquet below on any change -->
+     <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>
  
-     <awsjavasdk.version>2.54.11</awsjavasdk.version>
++    <awsjavasdk.version>2.54.13</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>