>From Michael Blow <mb...@apache.org>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20263 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
* [NO ISSUE][HYR] Update Jackson to 2.19.2 to address CVEs
Ext-ref: MB-68123
Change-Id: I8bf18e036994e3981fae8a021da3b4b2258651bd
---
M
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
M
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
M
asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_profiled.xml
M
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
6 files changed, 36 insertions(+), 2 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
index 03cbc23..7db9ee1 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
@@ -30,6 +30,12 @@
"compiler\.textsearchmemory" : 163840,
"compiler\.windowmemory" : 196608,
"default\.dir" : "target/io/dir/asterixdb",
+ "json\.max\.depth" : 1000,
+ "json\.max\.doc\.length" : -1,
+ "json\.max\.name\.length" : 50000,
+ "json\.max\.number\.length" : 1000,
+ "json\.max\.string\.length" : 2147483647,
+ "json\.max\.token\.count" : -1,
"library\.deploy\.timeout" : 1800,
"log\.dir" : "logs/",
"log\.level" : "INFO",
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
index e4f41d5..1c6f343 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
@@ -30,6 +30,12 @@
"compiler\.textsearchmemory" : 163840,
"compiler\.windowmemory" : 196608,
"default\.dir" : "target/io/dir/asterixdb",
+ "json\.max\.depth" : 1000,
+ "json\.max\.doc\.length" : -1,
+ "json\.max\.name\.length" : 50000,
+ "json\.max\.number\.length" : 1000,
+ "json\.max\.string\.length" : 2147483647,
+ "json\.max\.token\.count" : -1,
"library\.deploy\.timeout" : 1800,
"log\.dir" : "logs/",
"log\.level" : "WARN",
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
index 2c26e75..49251a9 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
@@ -30,6 +30,12 @@
"compiler\.textsearchmemory" : 163840,
"compiler\.windowmemory" : 196608,
"default\.dir" : "target/io/dir/asterixdb",
+ "json\.max\.depth" : 1000,
+ "json\.max\.doc\.length" : -1,
+ "json\.max\.name\.length" : 50000,
+ "json\.max\.number\.length" : 1000,
+ "json\.max\.string\.length" : 2147483647,
+ "json\.max\.token\.count" : -1,
"library\.deploy\.timeout" : 1800,
"log\.dir" : "logs/",
"log\.level" : "WARN",
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
index 42aac70..44bbeac 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
@@ -7219,7 +7219,7 @@
<test-case FilePath="misc">
<compilation-unit name="unsupported_parameter_value">
<output-dir compare="Text">none</output-dir>
- <expected-error>The given string: 4LS is not a byte unit string (e.g.,
320KB or 1024)</expected-error>
+ <expected-error>The given string: 4LS is not a byte unit string (e.g.,
320KiB or 1024)</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="misc">
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_profiled.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_profiled.xml
index 1972596..1d44006 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_profiled.xml
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_profiled.xml
@@ -7147,7 +7147,7 @@
<test-case FilePath="misc">
<compilation-unit name="unsupported_parameter_value">
<output-dir compare="Text">none</output-dir>
- <expected-error>The given string: 4LS is not a byte unit string (e.g.,
320KB or 1024)</expected-error>
+ <expected-error>The given string: 4LS is not a byte unit string (e.g.,
320KiB or 1024)</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="misc">
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20263
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: I8bf18e036994e3981fae8a021da3b4b2258651bd
Gerrit-Change-Number: 20263
Gerrit-PatchSet: 3
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-CC: Anon. E. Moose #1000171
Gerrit-MessageType: merged
