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/23 22:22:05 UTC
(asterixdb) 07/08: 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 a76fad045506262fa133fd715c3135a2c1211559
Merge: ef9b7dc092 b5fa89db5c
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Sep 23 09:24:40 2026 -0400
Merge branch 'gerrit/morpheus' into 'master'
* [NO ISSUE][MISC] Advance the AWS SDK to 2.54.18 (MB-73268)
* [NO ISSUE][MISC] Advance zookeeper to 3.9.6 (MB-73268)
* [NO ISSUE][OTH] Make flwor test deterministic (MB-68099)
* [NO ISSUE][MISC] Advance jackson, nimbus-jose-jwt and s3mock
(MB-73268)
* [NO ISSUE][MISC] Advance the AWS SDK to 2.55.3 (MB-73268)
s3mock is not managed on this branch, and the flwor change is already
here.
Co-Authored-By: Claude Opus 5.5 <no...@anthropic.com>
Ext-ref: MB-73268,MB-68099
Change-Id: Ic0aa45c41f9601ce76a51b5294912bd62b995954
asterixdb/pom.xml | 4 ++--
hyracks-fullstack/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --cc asterixdb/pom.xml
index d35e3da506,e310195b04..19c2a1f806
--- 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.17</awsjavasdk.version>
++ <awsjavasdk.version>2.55.3</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 f1899c63ed,2c27a3df0c..125e79cde1
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -73,20 -78,10 +73,20 @@@
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.26.1</log4j.version>
<snappy.version>1.1.10.8</snappy.version>
- <jackson.version>2.22.2</jackson.version>
+ <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.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.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>
@@@ -591,43 -541,8 +591,43 @@@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
- <version>10.9.1</version>
+ <version>10.10</version>
</dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <version>3.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-api</artifactId>
+ <version>3.5.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>