ODLPARENT-134: ensure correct startup with BC

[odlparent.git] / karaf / opendaylight-karaf-resources / pom.xml

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 6cb847191bfb0732b179348502f798cf436a6c16..08a25766dd1b41fea130607dfdee4b9f52752556 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -111,10 +111,16 @@
                        failonerror="true"/>
                 <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.7/pax-web-features-6.0.7-features.xml"
                       tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/6.0.7/pax-web-features-6.0.7-features.xml"/>
-                <patch patchfile="${project.basedir}/src/main/patches/karaf-etc-startup-properties-${karaf.version}.patch"
-                       originalfile="${project.build.directory}/assembly/etc/startup.properties"
-                       failonerror="true"/>
-                <echo file="${project.build.directory}/assembly/etc/system.properties" append="true">mvn\:org.osgi/org.osgi.service.event/1.3.1 = 8</echo>
+                <!-- 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.1.6 = 8
+mvn\:org.bouncycastle/bcprov-jdk15on/1.58 = 14
+mvn\:org.bouncycastle/bcpkix-jdk15on/1.58 = 14
+mvn\:org.bouncycastle/bcprov-ext-jdk15on/1.58 = 14
+mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0 = 14
+                </echo>
                 <copy file="${project.build.directory}/assembly/etc/startup.properties"
                       tofile="${project.build.directory}/classes/etc/startup.properties"/>
                 <fixcrlf srcdir="${project.build.directory}/classes/bin"