Upgrade log4j to version 2.15.0
Update log4j version to address known vulnerability
Issue-ID: CCSDK-3556
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Ie0840a7f45257092c93bd5dbb23d197a1de491b0
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 30a4638..f9e9812 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -176,11 +176,14 @@
<derby.version>10.14.2.0</derby.version>
<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>
<mariadb.connector.version>2.7.3</mariadb.connector.version>
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.52</tomcat-jdbc.version>
- <jetty.version>9.4.40.v20210413</jetty.version>
+
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index a55e5f2..80eef04 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -176,11 +176,14 @@
<derby.version>10.14.2.0</derby.version>
<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>
<mariadb.connector.version>2.7.3</mariadb.connector.version>
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.52</tomcat-jdbc.version>
- <jetty.version>9.4.40.v20210413</jetty.version>
+
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 21acb34..6adf57c 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -176,11 +176,14 @@
<derby.version>10.14.2.0</derby.version>
<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>
<mariadb.connector.version>2.7.3</mariadb.connector.version>
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.52</tomcat-jdbc.version>
- <jetty.version>9.4.40.v20210413</jetty.version>
+
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 0540b64..909d343 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -176,11 +176,14 @@
<derby.version>10.14.2.0</derby.version>
<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>
<mariadb.connector.version>2.7.3</mariadb.connector.version>
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.52</tomcat-jdbc.version>
- <jetty.version>9.4.40.v20210413</jetty.version>
+
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 1c16dee..ff3dbd8 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -176,11 +176,14 @@
<derby.version>10.14.2.0</derby.version>
<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>
<mariadb.connector.version>2.7.3</mariadb.connector.version>
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.52</tomcat-jdbc.version>
- <jetty.version>9.4.40.v20210413</jetty.version>
+
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index b8d7a7c..2e06a05 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -176,11 +176,14 @@
<derby.version>10.14.2.0</derby.version>
<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>
<mariadb.connector.version>2.7.3</mariadb.connector.version>
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.52</tomcat-jdbc.version>
- <jetty.version>9.4.40.v20210413</jetty.version>
+
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index f943dfc..b6a21df 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -176,11 +176,14 @@
<derby.version>10.14.2.0</derby.version>
<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>
<mariadb.connector.version>2.7.3</mariadb.connector.version>
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.52</tomcat-jdbc.version>
- <jetty.version>9.4.40.v20210413</jetty.version>
+
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index cd5b259..acd3942 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -176,11 +176,14 @@
<derby.version>10.14.2.0</derby.version>
<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>
<mariadb.connector.version>2.7.3</mariadb.connector.version>
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.52</tomcat-jdbc.version>
- <jetty.version>9.4.40.v20210413</jetty.version>
+
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 810ca4f..25d5479 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -176,11 +176,14 @@
<derby.version>10.14.2.0</derby.version>
<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>
<mariadb.connector.version>2.7.3</mariadb.connector.version>
<mariadb4j.version>2.4.0</mariadb4j.version>
<testng.version>6.14.3</testng.version>
<tomcat-jdbc.version>9.0.52</tomcat-jdbc.version>
- <jetty.version>9.4.40.v20210413</jetty.version>
+
<skip.karaf.featureTest>true</skip.karaf.featureTest>
<dependency-list.file>direct-dependencies.txt</dependency-list.file>
</properties>