commit 725fcd2532071059841924c7fde0b1163dad6418
author Michael Blow <michael.blow@couchbase.com> Fri Dec 10 09:22:38 2021 -0500
committer Michael Blow <michael.blow@couchbase.com> Fri Dec 10 09:22:38 2021 -0500
tree c06f8682ae5868462b5a3b99f66160cee1c7ee7e
parent e8637d0f6c1dcebdbeb422cb73884a86eb6f9214
parent 641196863c84bf1790e6f885508c8eb78a3e6511

Merge branch 'gerrit/stabilization-f69489'

Change-Id: Ie67b5c38d267d3e8b01e4b0989f688d155311909

asterixdb/pom.xml

diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 6952f0e..cd938dd 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -81,7 +81,7 @@
     <hyracks.version>0.3.5-SNAPSHOT</hyracks.version>
     <hadoop.version>2.8.5</hadoop.version>
     <jacoco.version>0.7.6.201602180812</jacoco.version>
-    <log4j.version>2.14.1</log4j.version>
+    <log4j.version>2.15.0</log4j.version>
 
     <implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
     <implementation.url>https://asterixdb.apache.org/</implementation.url>

hyracks-fullstack/pom.xml

diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 9a2c886..4193ca2 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>2.8.5</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>