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 c56d025a9e6ac6aca0ce8a0fb4a9928d02517a22 Merge: 117e797392 8f8402ed0c Author: Michael Blow <[email protected]> AuthorDate: Thu Jan 11 11:56:54 2024 -0500 Merge branch 'gerrit/trinity' into 'master' Change-Id: I5e6759c0e891e47feab9a5819fe4ffcd934bb9b9 asterixdb/pom.xml | 8 +- .../appended-resources/supplemental-models.xml | 98 +++++++++++----------- ...com_netty_netty_netty-4.1.101.Final_NOTICE.txt} | 0 ...om_qos-ch_slf4j_v_1.7.36_slf4j-api_LICENSE.txt} | 2 +- hyracks-fullstack/pom.xml | 10 +-- 5 files changed, 59 insertions(+), 59 deletions(-) diff --cc asterixdb/pom.xml index 3ca72c7f30,b41a5e7185..27efc8821d --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -81,18 -81,14 +81,18 @@@ <shim.stage>none</shim.stage> <pytestlib.stage>none</pytestlib.stage> <skip-npm-touch.stage>none</skip-npm-touch.stage> + <azurite.npm.install.stage>none</azurite.npm.install.stage> + <azurite.install.stage>none</azurite.install.stage> + <azurite.stage>none</azurite.stage> <!-- Versions under dependencymanagement or used in many projects via properties --> - <algebricks.version>0.3.8.2-SNAPSHOT</algebricks.version> - <hyracks.version>0.3.8.2-SNAPSHOT</hyracks.version> + <algebricks.version>0.3.9-SNAPSHOT</algebricks.version> + <hyracks.version>0.3.9-SNAPSHOT</hyracks.version> <hadoop.version>3.3.6</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> - <log4j.version>2.21.1</log4j.version> + <log4j.version>2.22.1</log4j.version> - <awsjavasdk.version>2.17.218</awsjavasdk.version> + <awsjavasdk.version>2.20.135</awsjavasdk.version> + <awsjavasdk.crt.version>0.27.1</awsjavasdk.crt.version> <parquet.version>1.12.3</parquet.version> <hadoop-awsjavasdk.version>1.12.572</hadoop-awsjavasdk.version> <azureblobjavasdk.version>12.22.0</azureblobjavasdk.version>
