Fix duplicate spifly jars

While investigating a blueprint issue, I came across:

[WARNING] Duplicate versions for org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle::jar, 1.2 and 1.0.10

Which boils dows to a disagreement between karaf standard feature
and pax-web-features. Since this is a dependency, just use the
version from Karaf, which is going to win anyway.

Change-Id: I8c9f455da21971e14197b3a0917c8fbe0a38710f
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 29f4b4161427bd7e40b07e519e3e3a22bfe91a7b..21a50f91bcca3d7dd02772432557683476c46a17 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -130,7 +130,10 @@
                 <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"
-                         token="org.apache.aries/org.apache.aries.util/1.1.0" value="org.apache.aries/org.apache.aries.util/1.1.3" failOnNoReplacements="true"/>
+                    token="org.apache.aries/org.apache.aries.util/1.1.0" value="org.apache.aries/org.apache.aries.util/1.1.3" failOnNoReplacements="true"/>
+                <!-- Keep consistency with standard-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"
+                         token="org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.0.10" value="org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.2" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
                       tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"/>
                 <!-- Add startup bundles to startup.properties — order is significant, bundles are wired in declaration order -->