>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21187?usp=email )
Change subject: Null merge branch 'gerrit/morpheus' into 'gerrit/lumina'
......................................................................
Null merge branch 'gerrit/morpheus' into 'gerrit/lumina'
* [NO ISSUE][MISC] Update Log4J to 2.25.4 for CVEs (MB-71657)
Change-Id: I48bb26461e49a4a127e9e3c6985dd36a747aa3e8
---
M asterixdb/pom.xml
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index b2e2fc8..d505d34 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -94,11 +94,7 @@
<hadoop.version>3.4.3</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.25.4</log4j.version>
-<<<<<<< HEAD (cc6412 [NO ISSUE][MISC] Update deps to latest patch versions)
<avro.version>1.12.1</avro.version>
-=======
- <awsjavasdk.version>2.29.27</awsjavasdk.version>
->>>>>>> BRANCH (c1117e Merge branch 'gerrit/trinity' into 'gerrit/morpheus')
<parquet.version>1.17.0</parquet.version> <!-- NOTICE: please update
transitives from parquet below on any change -->
<hadoop-awsjavasdk.version>1.12.797</hadoop-awsjavasdk.version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21187?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: lumina
Gerrit-Change-Id: I48bb26461e49a4a127e9e3c6985dd36a747aa3e8
Gerrit-Change-Number: 21187
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-CC: Jenkins <[email protected]>
