From 69377d2917510caa711e61a7ca51142fdb2abf6b Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 13 Aug 2019 09:58:26 +0200
Subject: [PATCH] Fixup commons-codec upgrade

This adds missing overrides to karaf distribution, so that we do
not package duplicate versions.

Change-Id: Icb8b3a7b7d923f2e0cb3d9ce02f719e436dbc191
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 karaf/opendaylight-karaf-resources/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index c9a8d08231..bcbadc7289 100644
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -115,7 +115,7 @@
                        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.12" failOnNoReplacements="true"/>
+                         token="commons-codec/commons-codec/1.10" 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"/>
                 <!-- fixes https://issues.apache.org/jira/browse/KARAF-5086 -->
@@ -126,7 +126,7 @@
                 <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
                          token="commons-beanutils/commons-beanutils/1.8.3" value="commons-beanutils/commons-beanutils/1.9.3" failOnNoReplacements="true"/>
                 <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
-                         token="commons-codec/commons-codec/1.8" value="commons-codec/commons-codec/1.12" failOnNoReplacements="true"/>
+                         token="commons-codec/commons-codec/1.8" value="commons-codec/commons-codec/1.13" failOnNoReplacements="true"/>
                 <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
                          token="javax.mail/mail/1.4.4" value="javax.mail/mail/1.4.7" failOnNoReplacements="true"/>
                 <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"