>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
......................................................................
Merge branch 'gerrit/trinity' into 'master'
Change-Id: I5e6759c0e891e47feab9a5819fe4ffcd934bb9b9
---
M asterixdb/pom.xml
2 files changed, 18 insertions(+), 6 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 76dd324..27efc88 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -90,14 +90,9 @@
<hyracks.version>0.3.9-SNAPSHOT</hyracks.version>
<hadoop.version>3.3.6</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (117e79 [ASTERIXDB-3332][COMP] Consolidate projection and
filters)
- <log4j.version>2.21.1</log4j.version>
+ <log4j.version>2.22.1</log4j.version>
<awsjavasdk.version>2.20.135</awsjavasdk.version>
<awsjavasdk.crt.version>0.27.1</awsjavasdk.crt.version>
-=======
- <log4j.version>2.22.1</log4j.version>
- <awsjavasdk.version>2.17.218</awsjavasdk.version>
->>>>>>> BRANCH (8f8402 Revert "[NO ISSUE][MISC] Update Jackson to 2.16.1")
<parquet.version>1.12.3</parquet.version>
<hadoop-awsjavasdk.version>1.12.572</hadoop-awsjavasdk.version>
<azureblobjavasdk.version>12.22.0</azureblobjavasdk.version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I5e6759c0e891e47feab9a5819fe4ffcd934bb9b9
Gerrit-Change-Number: 18089
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
