From e589974c3934b594fd63963bfc21cdd7c475cbea Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 15 Nov 2019 14:53:02 +0100
Subject: [PATCH] Upgrade to karaf-4.2.6

Release notes:
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12345365

This includes some important upgrades:
org.apache.aries.blueprint.core from 1.10.1 to 1.10.2
jetty from 9.4.12.v20180830 to 9.4.18.v20190429

We deal with KARAF-6345 by downgrading pax-logging back to 1.10.1,
which causes the underlying problem not to surface.

Change-Id: Ie3f46cdfb0e856ebe760dff7472ae7aefa30286e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 karaf/karaf4-parent/pom.xml                | 35 +++++++++++++++------
 karaf/opendaylight-karaf-resources/pom.xml | 36 ++++++++++++++--------
 odlparent/pom.xml                          |  4 +--
 3 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index 4fe40176e..3f06bbb2c 100644
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -196,8 +196,8 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <!-- Override karaf-4.2.5 mis-bump of Equinox -->
-                        <id>add-equinox-3.12</id>
+                        <!-- Override karaf-4.2.6+ use of pax-logging-1.10.2+ -->
+                        <id>add-pax-logging-1.10.1</id>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -205,10 +205,22 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.eclipse.platform</groupId>
-                                    <artifactId>org.eclipse.osgi</artifactId>
-                                    <version>3.12.100</version>
-                                    <outputDirectory>${project.build.directory}/assembly/system/org/eclipse/platform/org.eclipse.osgi/3.12.100</outputDirectory>
+                                    <groupId>org.ops4j.pax.logging</groupId>
+                                    <artifactId>pax-logging-api</artifactId>
+                                    <version>1.10.1</version>
+                                    <outputDirectory>${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-api/1.10.1</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.ops4j.pax.logging</groupId>
+                                    <artifactId>pax-logging-logback</artifactId>
+                                    <version>1.10.1</version>
+                                    <outputDirectory>${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-logback/1.10.1</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.ops4j.pax.logging</groupId>
+                                    <artifactId>pax-logging-log4j2</artifactId>
+                                    <version>1.10.1</version>
+                                    <outputDirectory>${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-log4j2/1.10.1</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                             <overWriteReleases>true</overWriteReleases>
@@ -282,14 +294,18 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>remove-equinox-3.13</id>
+                        <id>remove-pax-logging-1.10.2</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
                         <configuration>
                             <target>
-                                <delete dir="${project.build.directory}/assembly/system/org/eclipse/platform/org.eclipse.osgi/3.13.300"
+                                <delete dir="${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-api/1.10.2"
+                                    includeemptydirs="true"/>
+                                <delete dir="${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-logback/1.10.2"
+                                    includeemptydirs="true"/>
+                                <delete dir="${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-log4j2/1.10.2"
                                     includeemptydirs="true"/>
                             </target>
                         </configuration>
@@ -299,8 +315,7 @@
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>karaf-maven-plugin</artifactId>
-                <!-- Revert to ${karaf.version} once the POM deployment issue is fixed -->
-                <version>4.2.1</version>
+                <version>${karaf.version}</version>
                 <executions>
                     <execution>
                         <id>process-resources</id>
diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 43bf3c9d9..625ea928d 100644
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -79,11 +79,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="1.10.2" value="1.10.1" 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="1.10.2" value="1.10.1" 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"
@@ -101,6 +105,14 @@
                        failonerror="true"/>
                 <copy file="${project.build.directory}/assembly/bin/karaf.bat"
                       tofile="${project.build.directory}/classes/bin/karaf.bat"/>
+                <replace file="${project.build.directory}/assembly/bin/shell"
+                         token="1.10.2" value="1.10.1" 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="1.10.2" value="1.10.1" 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-setenv.patch"
                        originalfile="${project.build.directory}/assembly/bin/setenv"
                        failonerror="true"/>
@@ -111,26 +123,30 @@
                        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/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"
+                         token="/1.10.2" value="/1.10.1" 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"/>
                 <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"/>
                 <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
-                         token="commons-codec/commons-codec/1.11" value="commons-codec/commons-codec/1.13" failOnNoReplacements="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
-                         token="org.apache.commons/commons-lang3/3.8.1" value="org.apache.commons/commons-lang3/3.9" failOnNoReplacements="true"/>
+                         token="commons-codec/commons-codec/1.12" value="commons-codec/commons-codec/1.13" failOnNoReplacements="true"/>
                 <!-- fixes https://issues.apache.org/jira/browse/ARIES-1923 -->
                 <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                          token="org.apache.aries.proxy/org.apache.aries.proxy/1.1.4" value="org.apache.aries.proxy/org.apache.aries.proxy/1.1.6" failOnNoReplacements="true"/>
                 <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
-                         token="org.jolokia/jolokia-osgi/1.5.0" value="org.jolokia/jolokia-osgi/1.6.2" failOnNoReplacements="true"/>
+                         token="org.jolokia/jolokia-osgi/1.6.1" value="org.jolokia/jolokia-osgi/1.6.2" 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/ops4j/pax/web/pax-web-features/7.2.8/pax-web-features-7.2.8-features.xml"
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.10/pax-web-features-7.2.10-features.xml"
                          token="commons-beanutils/commons-beanutils/1.8.3" value="commons-beanutils/commons-beanutils/1.9.4" failOnNoReplacements="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.8/pax-web-features-7.2.8-features.xml"
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.10/pax-web-features-7.2.10-features.xml"
                          token="commons-codec/commons-codec/1.11" value="commons-codec/commons-codec/1.13" failOnNoReplacements="true"/>
-                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.8/pax-web-features-7.2.8-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.8/pax-web-features-7.2.8-features.xml"/>
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.10/pax-web-features-7.2.10-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.10/pax-web-features-7.2.10-features.xml"/>
+                <replace file="${project.build.directory}/assembly/etc/startup.properties"
+                         token="/1.10.2" value="/1.10.1" 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
@@ -142,10 +158,6 @@ mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.
                 </echo>
                 <copy file="${project.build.directory}/assembly/etc/startup.properties"
                       tofile="${project.build.directory}/classes/etc/startup.properties"/>
-                <replace file="${project.build.directory}/assembly/etc/config.properties"
-                         token="org.eclipse.platform/org.eclipse.osgi/3.13.300" value="org.eclipse.platform/org.eclipse.osgi/3.12.100" failOnNoReplacements="true"/>
-                <copy file="${project.build.directory}/assembly/etc/config.properties"
-                      tofile="${project.build.directory}/classes/etc/config.properties"/>
                 <fixcrlf srcdir="${project.build.directory}/classes/bin"
                          includes="*.bat" eol="crlf"/>
               </target>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 6348c43d6..886c60fcc 100644
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -46,7 +46,7 @@
     <!-- Used in openflowplugin -->
     <enforcer.version>3.0.0-M2</enforcer.version>
     <!-- Used in controller, genius, infrautils, netconf, netvirt, ovsdb, serviceutils -->
-    <karaf.version>4.2.5</karaf.version>
+    <karaf.version>4.2.6</karaf.version>
     <!-- Used in bgpcep, lispflowmapping -->
     <projectinfo>2.8.1</projectinfo>
 
@@ -967,7 +967,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
-        <version>9.4.12.v20180830</version>
+        <version>9.4.18.v20190429</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
-- 
2.36.6