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 2a7770b544f35084a5d07ee88999a9e7445b981e Author: Michael Blow <[email protected]> AuthorDate: Tue Jan 9 19:21:53 2024 -0500 [NO ISSUE][MISC] Update Log4j2 to 2.22.1 Change-Id: I414a65fd68371d25e9942a43c5b3275d75c664f2 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18087 Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> Tested-by: Michael Blow <[email protected]> --- asterixdb/pom.xml | 2 +- asterixdb/src/main/appended-resources/supplemental-models.xml | 8 ++++---- ...ubusercontent.com_qos-ch_slf4j_v_1.7.36_slf4j-api_LICENSE.txt} | 2 +- hyracks-fullstack/pom.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 7a5fd8af94..faf8918fee 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -87,7 +87,7 @@ <hyracks.version>0.3.8.2-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> <parquet.version>1.12.3</parquet.version> <hadoop-awsjavasdk.version>1.12.572</hadoop-awsjavasdk.version> diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 26dfe31e58..f48d3701b3 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -37,13 +37,13 @@ <licenses> <license> <name>an MIT-style license</name> - <url>https://raw.githubusercontent.com/qos-ch/slf4j/v_1.7.25/slf4j-api/LICENSE.txt</url> + <url>https://raw.githubusercontent.com/qos-ch/slf4j/v_1.7.36/slf4j-api/LICENSE.txt</url> </license> </licenses> <properties> - <license.ignoreMissingEmbeddedNotice>1.7.25</license.ignoreMissingEmbeddedNotice> - <license.ignoreMissingEmbeddedLicense>1.7.25</license.ignoreMissingEmbeddedLicense> - <license.ignoreLicenseOverride>1.7.25</license.ignoreLicenseOverride> + <license.ignoreMissingEmbeddedNotice>1.7.36</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedLicense>1.7.36</license.ignoreMissingEmbeddedLicense> + <license.ignoreLicenseOverride>1.7.36</license.ignoreLicenseOverride> </properties> </project> </supplement> diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_qos-ch_slf4j_v_1.7.25_slf4j-api_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_qos-ch_slf4j_v_1.7.36_slf4j-api_LICENSE.txt similarity index 95% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_qos-ch_slf4j_v_1.7.25_slf4j-api_LICENSE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_qos-ch_slf4j_v_1.7.36_slf4j-api_LICENSE.txt index 5a11c0c29e..f687729a0b 100644 --- a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_qos-ch_slf4j_v_1.7.25_slf4j-api_LICENSE.txt +++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_qos-ch_slf4j_v_1.7.36_slf4j-api_LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2004-2007 QOS.ch +Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland) All rights reserved. Permission is hereby granted, free of charge, to any person obtaining diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 3ec9740190..5852d62b30 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -71,7 +71,7 @@ <!-- Versions under dependencymanagement or used in many projects via properties --> <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> <snappy.version>1.1.10.5</snappy.version> <jackson.version>2.16.1</jackson.version> <jackson-databind.version>${jackson.version}</jackson-databind.version>
