Fix startup.properties versions

We have failed to bump versions of org.osgi.service.event and
org.apache.felix.metatype, leading to a versioning mismatch. While
this happens to work most of the time, it is causing rewires, which
end up locking sometimes up in SFT.

Fix the problem by properly bumping versions.

JIRA: ODLPARENT-253
Change-Id: I8443a5cc1f3d6788aa6f756c9960a735434d4a4e
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 dbfc7fba1d79a195d4d1a70b0d7af0a172e77da2..fe5699f30ebf53a0ce10bfabf8a03929f10ccc47 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -132,8 +132,8 @@
                 <!-- Add startup bundles to startup.properties — order is significant, bundles are wired in declaration order -->
                 <echo file="${project.build.directory}/assembly/etc/startup.properties" append="true">
 # The following are added by opendaylight-karaf-resources
-mvn\:org.osgi/org.osgi.service.event/1.3.1 = 7
-mvn\:org.apache.felix/org.apache.felix.metatype/1.2.2 = 8
+mvn\:org.osgi/org.osgi.service.event/1.4.0 = 7
+mvn\:org.apache.felix/org.apache.felix.metatype/1.2.4 = 8
 mvn\:org.opendaylight.odlparent/bcprov-framework-ext/${project.version} = 14
 mvn\:org.opendaylight.odlparent/bcpkix-framework-ext/${project.version} = 14
 mvn\:org.opendaylight.odlparent/logging-markers/${project.version} = 14