commit 78ac695633928dc83fb52c8b46e64e52befdcc42
author Michael Blow <mblow@apache.org> Sat Dec 11 11:42:42 2021 -0500
committer Michael Blow <mblow@apache.org> Sat Dec 11 11:42:42 2021 -0500
tree 72c498cda7382a5112bad5008d1dce140e2a451a
parent 5611472b663c3b2c1440133dfcdbd4b8e5eb01da
parent 18022c09ab62df440158cf936fb16ee1edfaa998

Merge branch 'gerrit/log4jfix-5e11053887'

Change-Id: I7d35496c98ddd528667dd0582659f2f9eb9fe5de

asterixdb/pom.xml

diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 14a7e4d..64b4f0f 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -86,7 +86,7 @@
     <hyracks.version>0.3.7-SNAPSHOT</hyracks.version>
     <hadoop.version>3.3.1</hadoop.version>
     <jacoco.version>0.7.6.201602180812</jacoco.version>
-    <log4j.version>2.14.1</log4j.version>
+    <log4j.version>2.15.0</log4j.version>
     <awsjavasdk.version>2.17.79</awsjavasdk.version>
     <parquet.version>1.12.0</parquet.version>
     <hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>

hyracks-fullstack/pom.xml

diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index d0cbcb9..cc5f1aa 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -72,7 +72,7 @@
     <!-- Versions under dependencymanagement or used in many projects via properties -->
     <hadoop.version>3.3.1</hadoop.version>
     <jacoco.version>0.7.6.201602180812</jacoco.version>
-    <log4j.version>2.14.1</log4j.version>
+    <log4j.version>2.15.0</log4j.version>
     <snappy.version>1.1.8.4</snappy.version>
     <jackson.version>2.13.0</jackson.version>