Bump pax-logging to 2.0.13

Update Karaf's packaged pax-logging from 2.0.12 to 2.0.13, closing
CVE-2021-45105 and CVE-2021-42550.

Change-Id: I72ff7a27d4cdad75214f161f0e5b58ba8328e6b1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit b1717f15d5c28a0a6b70f5aba7837c8ba1576586)

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 533b188075ec3a8de41457bea1b08423caf9eccb..9556cce73f235517653ad6fffdbf8b3cefd1b1ce 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -93,11 +93,15 @@
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-instance.patch"
                        originalfile="${project.build.directory}/assembly/bin/instance"
                        failonerror="true"/>
+                <replace file="${project.build.directory}/assembly/bin/instance"
+                         token="2.0.12" value="2.0.13" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/bin/instance"
                       tofile="${project.build.directory}/classes/bin/instance"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-instance.bat.patch"
                        originalfile="${project.build.directory}/assembly/bin/instance.bat"
                        failonerror="true" ignorewhitespace="true"/>
+                <replace file="${project.build.directory}/assembly/bin/instance.bat"
+                         token="2.0.12" value="2.0.13" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/bin/instance.bat"
                       tofile="${project.build.directory}/classes/bin/instance.bat"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-inc.patch"
@@ -125,6 +129,14 @@
                        failonerror="true"/>
                 <copy file="${project.build.directory}/assembly/bin/setenv.bat"
                       tofile="${project.build.directory}/classes/bin/setenv.bat"/>
+                <replace file="${project.build.directory}/assembly/bin/shell"
+                         token="2.0.12" value="2.0.13" failOnNoReplacements="true"/>
+                <copy file="${project.build.directory}/assembly/bin/shell"
+                      tofile="${project.build.directory}/classes/bin/shell"/>
+                <replace file="${project.build.directory}/assembly/bin/shell.bat"
+                         token="2.0.12" value="2.0.13" failOnNoReplacements="true"/>
+                <copy file="${project.build.directory}/assembly/bin/shell.bat"
+                      tofile="${project.build.directory}/classes/bin/shell.bat"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-quiesce.patch"
                        originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                        failonerror="true"/>
@@ -136,8 +148,12 @@
                          token="1.7.0" value="1.7.1" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                       tofile="${project.build.directory}/classes/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"/>
+                <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"
+                         token="2.0.12" value="2.0.13" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"
                       tofile="${project.build.directory}/classes/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"/>
+                <replace file="${project.build.directory}/assembly/etc/startup.properties"
+                         token="2.0.12" value="2.0.13" failOnNoReplacements="true"/>
                 <!-- Add startup bundles to startup.properties — order is significant, bundles are wired in declaration order -->
                 <echo file="${project.build.directory}/assembly/etc/startup.properties" append="true">
 # The following are added by opendaylight-karaf-resources