From: Dan Timoney <dtimoney@att.com>
Date: Wed, 15 Dec 2021 14:07:27 +0000 (-0500)
Subject: Update log4j to 2.16.0
X-Git-Tag: 2.3.2~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7dc9fd91d3914b0bafae371bde44d13bf1e03e03;p=ccsdk%2Fparent.git

Update log4j to 2.16.0

Update log4j2 to version 2.16.0 to address new variant of log4shell

Issue-ID: CCSDK-3556
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I28d4e9657db054edeb4788946c36bd1476fbdf55
---

diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index ca1b475d..c1b3a798 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -211,12 +211,12 @@
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-slf4j-impl</artifactId>
-                <version>2.15.0</version>
+                <version>2.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-core</artifactId>
-                <version>2.15.0</version>
+                <version>2.16.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index f9e9812b..97060313 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -177,8 +177,8 @@
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <jetty.version>9.4.40.v20210413</jetty.version>
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 80eef04d..5f3366d3 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -177,8 +177,8 @@
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <jetty.version>9.4.40.v20210413</jetty.version>
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 6adf57cd..14fd1d98 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -177,8 +177,8 @@
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <jetty.version>9.4.40.v20210413</jetty.version>
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 909d3439..69cea201 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -177,8 +177,8 @@
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <jetty.version>9.4.40.v20210413</jetty.version>
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index ff3dbd81..bced9bc1 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -177,8 +177,8 @@
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <jetty.version>9.4.40.v20210413</jetty.version>
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 2e06a05e..72db8bb2 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -177,8 +177,8 @@
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <jetty.version>9.4.40.v20210413</jetty.version>
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index b6a21df3..2c0b548d 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -177,8 +177,8 @@
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <jetty.version>9.4.40.v20210413</jetty.version>
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index acd39427..3e3338fb 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -177,8 +177,8 @@
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <jetty.version>9.4.40.v20210413</jetty.version>
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 25d54796..7129e0ea 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -177,8 +177,8 @@
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.21.1</grpc.version>
         <jetty.version>9.4.40.v20210413</jetty.version>
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <testng.version>6.14.3</testng.version>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index 28069366..c72af7f4 100755
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -77,8 +77,8 @@
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
         <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
 
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <fasterxml.jackson.version>2.10.5</fasterxml.jackson.version>
         <velocity.version>2.3</velocity.version>
diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
index 25b52763..9d176c63 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -130,8 +130,8 @@
         <jersey.version>${springboot.jersey.version}</jersey.version>
         <jersey.client.version>${springboot.jersey.version}</jersey.client.version>
         <jettison.version>1.3.8</jettison.version>
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <logback.version>1.2.3</logback.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 81ae5726..22f35514 100644
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -130,8 +130,8 @@
         <jersey.version>2.30.1</jersey.version>
         <jersey.client.version>2.30.1</jersey.client.version>
         <jettison.version>1.3.8</jettison.version>
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <logback.version>1.2.3</logback.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 0915673c..f0b49740 100644
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -130,8 +130,8 @@
         <jersey.version>2.30.1</jersey.version>
         <jersey.client.version>2.30.1</jersey.client.version>
         <jettison.version>1.3.8</jettison.version>
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <logback.version>1.2.3</logback.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
diff --git a/standalone/pom.xml b/standalone/pom.xml
index da8c76eb..12f0df42 100755
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -65,8 +65,8 @@
         <bundle.plugin.version>2.5.0</bundle.plugin.version>
         <checkstyle.skip>true</checkstyle.skip>
 
-        <log4j.version>2.15.0</log4j.version>
-        <log4j2.version>2.15.0</log4j2.version>
+        <log4j.version>2.16.0</log4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <mariadb.connector.version>2.7.2</mariadb.connector.version>
         <fasterxml.jackson.version>2.12.4</fasterxml.jackson.version>
         <velocity.version>2.3</velocity.version>