From 22efe2224c3b69d2d7dcbbb5434b34b4a0193f1c Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 1 Mar 2019 11:38:59 +0100
Subject: [PATCH] Add a fix for KARAF-5086

This is manual upgrade of aries/proxy-impl to make it work with
Java 8 default methods.

Change-Id: I05ad26c2608bb76f4482e231cf5d07e0016f7082
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit fe6f26cbf3ced523b8251e7a9a8c48cd10441cb4)
---
 karaf/opendaylight-karaf-resources/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index d454f2e84..de2f95ba5 100644
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -104,6 +104,9 @@
                        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"/>
+                <!-- fixes https://issues.apache.org/jira/browse/KARAF-5086 -->
+                <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.3" value="org.apache.aries.proxy/org.apache.aries.proxy/1.1.4" 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.5/pax-web-features-7.2.5-features.xml"
-- 
2.36.6