You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2025/11/21 20:36:16 UTC

(asterixdb) 05/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 620a0681d56ceaf8a2b0fdf9ad939afaadda1142
Merge: c67c9048cb 8b342cc119
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sun Aug 24 12:03:25 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [NO ISSUE][HYR] Update Jackson to 2.19.2 to address CVEs
    
    Ext-ref: MB-68123
    Change-Id: I032a9e8ce79fe1eeaa59afc077062ff0a1cff7b0

 .../asterix/common/config/ConfigUsageTest.java     |   2 +-
 .../api/cluster_state_1/cluster_state_1.1.regexadm |   6 +
 .../cluster_state_1_full.1.regexadm                |   6 +
 .../cluster_state_1_less.1.regexadm                |   6 +
 .../src/test/resources/runtimets/sqlpp_queries.xml |   2 +-
 .../runtimets/testsuite_sqlpp_profiled.xml         |   2 +-
 .../asterix/common/api/IPropertiesFactory.java     |   3 +
 .../asterix/common/config/AsterixProperties.java   |  10 +-
 .../asterix/common/config/JacksonProperties.java   | 138 +++++++++++++++++++++
 .../asterix/common/config/PropertiesFactory.java   |   5 +
 asterixdb/pom.xml                                  |  56 +++++++--
 .../org/apache/hyracks/control/cc/CCDriver.java    |   5 +-
 .../control/common/config/ConfigManager.java       |   7 +-
 .../control/common/controllers/NCConfig.java       |   3 +-
 .../java/org/apache/hyracks/util/StorageUtil.java  |  23 ++--
 .../org/apache/hyracks/util/StorageUnitTest.java   |  17 ++-
 hyracks-fullstack/pom.xml                          |  96 +++++++++++++-
 17 files changed, 351 insertions(+), 36 deletions(-)