From 4bb4fd75b60072feb9764e1702748e50944ea499 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Mon, 3 Jan 2022 13:23:53 -0500
Subject: Upgrade to log4j2 2.17.1

Update to use version 2.17.1 to resolve log4shell vulnerability

Issue-ID: CCSDK-3556
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I5e9c6f211df52eb7db27b1479bb295d473c0dded
---
 opendaylight/silicon/silicon-alpine/pom.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'opendaylight/silicon/silicon-alpine/pom.xml')

diff --git a/opendaylight/silicon/silicon-alpine/pom.xml b/opendaylight/silicon/silicon-alpine/pom.xml
index 029bc829..d8111fcf 100644
--- a/opendaylight/silicon/silicon-alpine/pom.xml
+++ b/opendaylight/silicon/silicon-alpine/pom.xml
@@ -23,7 +23,7 @@
         <odl.shiro.version>0.13.5</odl.shiro.version>
         <odl.ops4j.version>7.3.16</odl.ops4j.version>
         <odl.pax.logging.version>2.0.9</odl.pax.logging.version>
-        <patch.pax.logging.version>2.0.12</patch.pax.logging.version>
+        <patch.pax.logging.version>2.0.14</patch.pax.logging.version>
         <odl.karaf.framework.version>4.3.2</odl.karaf.framework.version>
         <odl.netconf.version>1.13.4</odl.netconf.version>
     </properties>
@@ -123,6 +123,14 @@
                                     <destFileName>pax-logging-log4j2-${patch.pax.logging.version}.jar</destFileName>
                                     <excludes>*</excludes>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.ops4j.pax.logging</groupId>
+                                    <artifactId>pax-logging-logback</artifactId>
+                                    <version>${patch.pax.logging.version}</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-logback/${patch.pax.logging.version}</outputDirectory>
+                                    <destFileName>pax-logging-logback-${patch.pax.logging.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.ops4j.pax.logging</groupId>
                                     <artifactId>pax-logging-api</artifactId>
@@ -185,7 +193,7 @@
                                         <include>framework-${odl.karaf.framework.version}-features.xml</include>
                                         <include>startup.properties</include>
                                     </includes>
-                                    <filtering>false</filtering>
+                                    <filtering>true</filtering>
                                 </resource>
                             </resources>
                         </configuration>
-- 
cgit 1.2.3-korg