>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20825?usp=email )
Change subject: Merge branch 'gerrit/stabilization-667a908755' into 'gerrit/neo'
......................................................................
Merge branch 'gerrit/stabilization-667a908755' into 'gerrit/neo'
* [NO ISSUE][*DB][EXT] Advance GCS dependencies (MB-70233)
Ext-ref: MB-70233
Change-Id: I992bb89b389e28664137f60895333d77ec7435d4
---
M asterixdb/pom.xml
2 files changed, 3 insertions(+), 8 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/25/20825/1
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 2cf987e..5fe64b6 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -90,7 +90,6 @@
<awsjavasdk.version>2.29.27</awsjavasdk.version>
<parquet.version>1.15.2</parquet.version> <!-- NOTICE: please update
transitives from parquet below on any change -->
<hadoop-awsjavasdk.version>1.12.779</hadoop-awsjavasdk.version>
-<<<<<<< HEAD (0646f9 [ASTERIXDB-3689][HYR][NET] MuxDemux negotiation
hardening)
<azureblobjavasdk.version>12.31.1</azureblobjavasdk.version>
<azurecommonjavasdk.version>12.30.1</azurecommonjavasdk.version>
@@ -99,14 +98,7 @@
<azurecore.version>1.56.0</azurecore.version>
<azurecorehttpnetty.version>1.16.0</azurecorehttpnetty.version>
- <gcsjavasdk.version>2.45.0</gcsjavasdk.version>
-=======
- <azureblobjavasdk.version>12.25.1</azureblobjavasdk.version>
- <azurecommonjavasdk.version>12.24.1</azurecommonjavasdk.version>
- <azureidentity.version>1.13.3</azureidentity.version>
- <azuredatalakejavasdk.version>12.18.1</azuredatalakejavasdk.version>
<gcsjavasdk.version>2.61.0</gcsjavasdk.version>
->>>>>>> BRANCH (0e277d [NO ISSUE][*DB][EXT] Advance GCS dependencies)
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
<implementation.title>Apache AsterixDB -
${project.name}</implementation.title>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20825?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: I992bb89b389e28664137f60895333d77ec7435d4
Gerrit-Change-Number: 20825
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
