From 3cb7d9be1bca1c411b6da72464a6b69cdf602568 Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Fri, 4 Jan 2019 17:54:10 +0100
Subject: [PATCH] Avoid pulling old versions
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This uses karaf-plugin’s ability to resolve patched features to
upgrade the versions of javax.mail, commons-codec, commons-collections
and aries.util pulled in by Karaf and Pax.

We need to change the order of steps in karaf4-parent so that the
Karaf assembly is processed first, then the resources overwritten with
our versions, before karaf-plugin resolves the dependencies.

JIRA: ODLPARENT-189
Change-Id: Id78d7301bd402bc6872fe8a696af9ddc734cbe8d
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 28b9918768613ba11731d7bbc99c354bb34f8ccc)
---
 karaf/karaf4-parent/pom.xml                   | 34 +++++++++----------
 karaf/opendaylight-karaf-resources/pom.xml    | 16 +++++----
 .../main/patches/karaf-javax-mail-4.1.7.patch | 11 ------
 .../src/main/patches/karaf-paxweb.patch       | 11 ------
 4 files changed, 27 insertions(+), 45 deletions(-)
 delete mode 100644 karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.1.7.patch
 delete mode 100644 karaf/opendaylight-karaf-resources/src/main/patches/karaf-paxweb.patch

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index d7fd19914..f7a601e5a 100644
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -124,23 +124,6 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>karaf-plugin</artifactId>
-                <version>3.1.6-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <id>populate-local-repo</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>populate-local-repo</goal>
-                        </goals>
-                        <configuration>
-                            <localRepo>${project.build.directory}/assembly/system</localRepo>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -229,6 +212,23 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>karaf-plugin</artifactId>
+                <version>3.1.6-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <id>populate-local-repo</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>populate-local-repo</goal>
+                        </goals>
+                        <configuration>
+                            <localRepo>${project.build.directory}/assembly/system</localRepo>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index b7a1a3bae..1727e2e24 100644
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -102,14 +102,18 @@
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-quiesce-${karaf.version}.patch"
                        originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                        failonerror="true"/>
-                <patch patchfile="${project.basedir}/src/main/patches/karaf-javax-mail-${karaf.version}.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.10" value="commons-codec/commons-codec/1.11" 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"/>
-                <patch patchfile="${project.basedir}/src/main/patches/karaf-paxweb.patch"
-                       originalfile="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.11/pax-web-features-6.0.11-features.xml"
-                       failonerror="true"/>
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.11/pax-web-features-6.0.11-features.xml"
+                         token="javax.mail/mail/1.4.4" value="javax.mail/mail/1.4.5" failOnNoReplacements="true"/>
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.11/pax-web-features-6.0.11-features.xml"
+                         token="commons-codec/commons-codec/1.8" value="commons-codec/commons-codec/1.11" failOnNoReplacements="true"/>
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.11/pax-web-features-6.0.11-features.xml"
+                         token="commons-collections/commons-collections/3.2.1" value="commons-collections/commons-collections/3.2.2" failOnNoReplacements="true"/>
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.11/pax-web-features-6.0.11-features.xml"
+                         token="org.apache.aries/org.apache.aries.util/1.1.0" value="org.apache.aries/org.apache.aries.util/1.1.3" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.11/pax-web-features-6.0.11-features.xml"
                       tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/6.0.11/pax-web-features-6.0.11-features.xml"/>
                 <!-- Add startup bundles to startup.properties — order is significant, bundles are wired in declaration order -->
diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.1.7.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.1.7.patch
deleted file mode 100644
index e57a52714..000000000
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.1.7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- system/org/apache/karaf/features/standard/4.0.9/standard-4.0.9-features.xml	2017-02-13 15:13:43.895825491 +0100
-+++ system/org/apache/karaf/features/standard/4.0.9/standard-4.0.9-features.xml	2017-02-13 15:40:10.593825491 +0100
-@@ -316,7 +316,7 @@
-     <feature name="jetty" version="8.1.14.v20131031">
-         <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>
-         <bundle dependency="true" start-level="30">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
--        <bundle dependency="true" start-level="30">mvn:javax.mail/mail/1.4.5</bundle>
-+        <bundle dependency="true" start-level="30">mvn:javax.mail/mail/1.4.4</bundle>
-         <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
-         <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0.1</bundle>
-         <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1</bundle>
diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-paxweb.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-paxweb.patch
deleted file mode 100644
index 5629add64..000000000
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-paxweb.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./target/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.11/pax-web-features-6.0.11-features.xml	2018-08-16 13:22:43.388303948 +0200
-+++ ./target/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.11/pax-web-features-6.0.11-features.xml	2018-08-16 13:22:53.800331154 +0200
-@@ -22,7 +22,7 @@
-         <bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-api/6.0.11</bundle>
-         <bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-spi/6.0.11</bundle>
- 
--        <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm-all/5.0.2</bundle>
-+        <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm-all/5.0.4</bundle>
- 
-         <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-bundleutils/4.1</bundle>
-         <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-reflect/4.1</bundle>
-- 
2.36.6