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 8b342cc1197dc56d9669d1b84452b8537a62d742 Merge: 37fd8f74f2 c0cd3f51d3 Author: Michael Blow <[email protected]> AuthorDate: Sat Aug 23 10:15:52 2025 -0400 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 .../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(-) diff --cc asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm index 03cbc23173,cb10dd2276..7db9ee1dd6 --- 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 -29,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 --cc asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm index e4f41d565c,59d595bffb..1c6f3432e5 --- 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 -29,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 --cc asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm index 2c26e752c2,56b413d190..49251a9817 --- 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 -29,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 --cc asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml index 42aac70424,15a94fe086..44bbeacc18 --- a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml @@@ -7219,7 -7194,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 --cc asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_profiled.xml index 1972596468,15a94fe086..1d440067de --- 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 -7194,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"> diff --cc asterixdb/pom.xml index 254a7d95d6,c5c278c84a..a55752b2d9 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -91,14 -90,16 +91,18 @@@ <awsjavasdk.version>2.29.27</awsjavasdk.version> <parquet.version>1.15.2</parquet.version> <!-- NOTICE: please update transitives from parquet below on any change --> <hadoop-awsjavasdk.version>1.12.779</hadoop-awsjavasdk.version> - <azureblobjavasdk.version>12.25.1</azureblobjavasdk.version> - <azurecommonjavasdk.version>12.24.1</azurecommonjavasdk.version> - <azureidentity.version>1.13.3</azureidentity.version> - <azuredatalakejavasdk.version>12.18.1</azuredatalakejavasdk.version> + + <azureblobjavasdk.version>12.31.1</azureblobjavasdk.version> + <azurecommonjavasdk.version>12.30.1</azurecommonjavasdk.version> + <azureidentity.version>1.17.0</azureidentity.version> + <azuredatalakejavasdk.version>12.24.1</azuredatalakejavasdk.version> + <azurecore.version>1.56.0</azurecore.version> + <azurecorehttpnetty.version>1.16.0</azurecorehttpnetty.version> + <gcsjavasdk.version>2.45.0</gcsjavasdk.version> <hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version> + <hadoop-gcs.version>hadoop3-2.2.25</hadoop-gcs.version> + <io.opencensus.version>0.31.1</io.opencensus.version> <implementation.title>Apache AsterixDB - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> @@@ -1814,58 -1840,8 +1852,58 @@@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-tcnative-boringssl-static</artifactId> - <version>2.0.71.Final</version> + <version>2.0.72.Final</version> </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-census</artifactId> + <version>1.68.1</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-http-util</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-api</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-impl</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-impl-core</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-exporter-stats-stackdriver</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-exemplar-util</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-resource-util</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-exporter-metrics-util</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-grpc-metrics</artifactId> + <version>${io.opencensus.version}</version> + </dependency> </dependencies> </dependencyManagement> diff --cc hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java index bb40e2b728,44cb7e61a1..db8014b8c1 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java @@@ -99,11 -99,9 +99,10 @@@ public class NCConfig extends Controlle PYTHON_USE_BUNDLED_MSGPACK(BOOLEAN, true), PYTHON_ARGS(STRING_ARRAY, (String[]) null), PYTHON_ENV(STRING_ARRAY, (String[]) null), + PYTHON_DS_PATH(STRING, (String) null), CREDENTIAL_FILE( OptionTypes.STRING, - (Function<IApplicationConfig, String>) appConfig -> FileUtil - .joinPath(appConfig.getString(ControllerConfig.Option.DEFAULT_DIR), "passwd"), + appConfig -> FileUtil.joinPath(appConfig.getString(ControllerConfig.Option.DEFAULT_DIR), "passwd"), ControllerConfig.Option.DEFAULT_DIR.cmdline() + "/passwd"); private final IOptionType parser; diff --cc hyracks-fullstack/pom.xml index 3ae6870381,a72968d200..241252fa81 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@@ -71,11 -72,11 +71,11 @@@ <!-- Versions under dependencymanagement or used in many projects via properties --> <hadoop.version>3.4.1</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> - <log4j.version>2.19.0</log4j.version> + <log4j.version>2.22.1</log4j.version> <snappy.version>1.1.10.5</snappy.version> - <jackson.version>2.14.3</jackson.version> + <jackson.version>2.19.2</jackson.version> <jackson-databind.version>${jackson.version}</jackson-databind.version> - <netty.version>4.1.121.Final</netty.version> + <netty.version>4.1.124.Final</netty.version> <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url>
