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>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 03cc8643a61e4b8027d863aafcb523debb2ab1db..3800bb3c11de6df51811b509e9f7633e461c47c8 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -107,6 +107,9 @@
                 <!-- fixes https://issues.apache.org/jira/browse/KARAF-6078, remove when upgrading to karaf-4.1.8+ -->
                 <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                          token="9.3.21.v20170918" value="9.3.24.v20180605" 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.1" 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/6.0.11/pax-web-features-6.0.11-features.xml"