>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21102?usp=email )
Change subject: Merge branch 'gerrit/phoenix' into 'gerrit/lumina'
......................................................................
Merge branch 'gerrit/phoenix' into 'gerrit/lumina'
* [NO ISSUE][*DB][EXT] Update Apache Hadoop -> 3.4.2 for CVE (MB-70644)
* [NO ISSUE][*DB][EXT] Advance Apache Avro to 1.12.1 for CVE (MB-71158)
Change-Id: Id7d20b94f106485fe89e9310fe4bfd3bc9b43895
---
M asterixdb/pom.xml
2 files changed, 4 insertions(+), 12 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index ea0bf09..d98e3da 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -93,11 +93,7 @@
<hyracks.version>0.3.10-SNAPSHOT</hyracks.version>
<hadoop.version>3.4.2</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (07de7f [NO ISSUE][EXT] Throw ExternalSourceError when colons
are pr)
<log4j.version>2.25.3</log4j.version>
-=======
- <log4j.version>2.22.1</log4j.version>
->>>>>>> BRANCH (ee889b [NO ISSUE][*DB][EXT] Advance Apache Avro to 1.12.1 for
CVE)
<avro.version>1.12.1</avro.version>
<!-- IMPORTANT: please keep the aws-crt version in sync with that defined
in the AWS SDK BOM -->
<!-- you can get this by inspecting the aws-sdk-java-pom for the SDK
version. e.g.
@@ -1936,14 +1932,6 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
-<<<<<<< HEAD (07de7f [NO ISSUE][EXT] Throw ExternalSourceError when colons
are pr)
-=======
- </dependency>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-mapred</artifactId>
- <version>${avro.version}</version>
->>>>>>> BRANCH (ee889b [NO ISSUE][*DB][EXT] Advance Apache Avro to 1.12.1 for
CVE)
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21102?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: Id7d20b94f106485fe89e9310fe4bfd3bc9b43895
Gerrit-Change-Number: 21102
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
