>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20827?usp=email )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
* [NO ISSUE][*DB][EXT] Advance GCS dependencies (MB-70233)
Ext-ref: MB-70233
Change-Id: I50bfc9b3bf2d4dd1984af9668b2bab2304c61ef1
---
M asterixdb/pom.xml
2 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
Jenkins: Verified
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index ec5c672..3442706 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -99,7 +99,7 @@
<azurecore.version>1.56.0</azurecore.version>
<azurecorehttpnetty.version>1.16.0</azurecorehttpnetty.version>
- <gcsjavasdk.version>2.61.0</gcsjavasdk.version>
+ <gcsjavasdk.version>2.62.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
<hadoop-gcs.version>hadoop3-2.2.25</hadoop-gcs.version>
<io.opencensus.version>0.31.1</io.opencensus.version>
@@ -1846,9 +1846,10 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
-<<<<<<< HEAD (c219e3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
- <artifactId>grpc-census</artifactId>
- <version>1.68.1</version>
+ <artifactId>grpc-bom</artifactId>
+ <version>1.78.0</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
@@ -1894,10 +1895,6 @@
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-grpc-metrics</artifactId>
<version>${io.opencensus.version}</version>
-=======
- <artifactId>grpc-netty-shaded</artifactId>
- <version>1.78.0</version>
->>>>>>> BRANCH (ec4a3f Merge branch 'gerrit/stabilization-667a908755' into
'gerrit/)
</dependency>
</dependencies>
</dependencyManagement>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20827?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: I50bfc9b3bf2d4dd1984af9668b2bab2304c61ef1
Gerrit-Change-Number: 20827
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-CC: Anon. E. Moose #1000171
