>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21202?usp=email )
Change subject: Merge branch 'gerrit/stabilization-667a908755' into 'gerrit/neo'
......................................................................
Merge branch 'gerrit/stabilization-667a908755' into 'gerrit/neo'
* [NO ISSUE][*DB][EXT] Update Apache Hadoop -> 3.4.2 for CVE (MB-70644)
* [NO ISSUE][MISC] Update StringJsonParseEval for compat w/ Jackson 2.21[.3]
(MB-71736)
Ext-ref: MB-71736
Change-Id: I98ba53b0183a1066633c64be2b7e08ef2505c1d3
---
M asterixdb/pom.xml
2 files changed, 4 insertions(+), 5 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 0f951a0..8c503f5 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -82,13 +82,8 @@
<skip-npm-touch.stage>none</skip-npm-touch.stage>
<!-- Versions under dependencymanagement or used in many projects via
properties -->
-<<<<<<< HEAD (f42ec6 [NO ISSUE][*DB][EXT] Update Apache Hadoop -> 3.4.2 for
CVE)
<algebricks.version>0.3.8.2-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.8.2-SNAPSHOT</hyracks.version>
-=======
- <algebricks.version>0.3.8-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.8-SNAPSHOT</hyracks.version>
->>>>>>> BRANCH (a7f336 [NO ISSUE][MISC] Update StringJsonParseEval for compat
w/ Ja)
<hadoop.version>3.4.2</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.19.0</log4j.version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21202?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: neo
Gerrit-Change-Id: I98ba53b0183a1066633c64be2b7e08ef2505c1d3
Gerrit-Change-Number: 21202
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
