>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20929?usp=email )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
* [NO ISSUE][*DB][EXT] Update Apache Hadoop -> 3.4.2 for CVE (MB-70644)
Ext-ref: MB-70644
Change-Id: I0e6cfb7cf9893572087038c15a83488ee41817a9
---
M asterixdb/pom.xml
2 files changed, 3 insertions(+), 6 deletions(-)
Approvals:
Jenkins: Verified
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index f822773..4f4e825 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -83,15 +83,9 @@
<skip-npm-touch.stage>none</skip-npm-touch.stage>
<!-- Versions under dependencymanagement or used in many projects via
properties -->
-<<<<<<< HEAD (627a10 [NO ISSUE][MISC] Update Log4j to 2.25.3 for CVE)
<algebricks.version>0.3.8.3-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.8.3-SNAPSHOT</hyracks.version>
- <hadoop.version>3.4.1</hadoop.version>
-=======
- <algebricks.version>0.3.8.2-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.8.2-SNAPSHOT</hyracks.version>
<hadoop.version>3.4.2</hadoop.version>
->>>>>>> BRANCH (f42ec6 [NO ISSUE][*DB][EXT] Update Apache Hadoop -> 3.4.2 for
CVE)
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.25.3</log4j.version>
<awsjavasdk.version>2.29.27</awsjavasdk.version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20929?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: I0e6cfb7cf9893572087038c15a83488ee41817a9
Gerrit-Change-Number: 20929
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-CC: Anon. E. Moose #1000171
