>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21211?usp=email )
Change subject: Merge branch 'gerrit/morpheus' into 'gerrit/lumina'
......................................................................
Merge branch 'gerrit/morpheus' into 'gerrit/lumina'
* [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)
* [NO ISSUE][MISC] Update Jackson to 2.21[.3] for GHSA-72hv-8253-57qq
(MB-71736)
Change-Id: I0d37088513dc4dc7b7cc9e594bdfcaba927f4174
---
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/evaluators/StringJsonParseEval.java
M hyracks-fullstack/pom.xml
3 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/11/21211/1
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/evaluators/StringJsonParseEval.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/evaluators/StringJsonParseEval.java
index f47817b..b99e2b7 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/evaluators/StringJsonParseEval.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/evaluators/StringJsonParseEval.java
@@ -154,8 +154,6 @@
throw HyracksDataException.create(e);
}
}
-<<<<<<< HEAD (81eb84 Merge branch 'gerrit/morpheus' into 'gerrit/lumina')
-=======
/**
* Returns true if the byte range contains a CESU-8 encoded surrogate
(0xED [0xA0-0xBF] ...).
@@ -172,5 +170,4 @@
}
return false;
}
->>>>>>> BRANCH (196f3c Merge branch 'gerrit/trinity' into 'gerrit/morpheus')
}
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index ba4a676..2f80831 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -73,12 +73,8 @@
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.25.4</log4j.version>
<snappy.version>1.1.10.8</snappy.version>
-<<<<<<< HEAD (81eb84 Merge branch 'gerrit/morpheus' into 'gerrit/lumina')
- <jackson.version>2.19.4</jackson.version>
-=======
<jackson.version>2.21.3</jackson.version>
<jackson-annotations.version>2.21</jackson-annotations.version>
->>>>>>> BRANCH (196f3c Merge branch 'gerrit/trinity' into 'gerrit/morpheus')
<jackson-databind.version>${jackson.version}</jackson-databind.version>
<netty.version>4.1.132.Final</netty.version>
<asm.version>9.3</asm.version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21211?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: asterixdb
Gerrit-Branch: lumina
Gerrit-Change-Id: I0d37088513dc4dc7b7cc9e594bdfcaba927f4174
Gerrit-Change-Number: 21211
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
