BUG-4219: fix karaf CLI reload

Controller's blueprint extenstion is pulling in an optional
dependency of pax-logging, causing it to reload, effectively
restarting everything. Wire osgi-service before starting up
to eliminate this.

Change-Id: Idf0170d805e98362e7f3560db7f166c68a18d19d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index 784a9880b764c904186a663233065f73345161b4..57a985d3c778b2ae4321bb2ef210624e92506ec6 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -226,8 +226,12 @@
                                 <patch patchfile="${project.build.directory}/assembly/patches/karaf-paxweb.patch"
                                        originalfile="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/4.3.0/pax-web-features-4.3.0-features.xml"
                                        failonerror="true"/>
+                                <patch patchfile="${project.build.directory}/assembly/patches/karaf-etc-startup-properties-4.0.9.patch"
+                                       originalfile="${project.build.directory}/assembly/etc/startup.properties"
+                                       failonerror="true"/>
                                 <fixcrlf srcdir="${project.build.directory}/assembly/bin"
                                          includes="*.bat" eol="crlf"/>
+                                <echo file="${project.build.directory}/assembly/etc/system.properties" append="true">mvn\:org.osgi/org.osgi.service.event/1.3.1 = 8</echo>
                             </target>
                         </configuration>
                     </execution>

diff --git a/karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-etc-startup-properties-4.0.9.patch b/karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-etc-startup-properties-4.0.9.patch
new file mode 100644 (file)
index 0000000..1086dff
--- /dev/null
+++ b/karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-etc-startup-properties-4.0.9.patch
@@ -0,0 +1,7 @@
+--- startup.properties.orig    2017-06-01 19:30:31.926891539 +0200
++++ startup.properties 2017-06-01 19:36:06.666646203 +0200
+@@ -7,3 +7,4 @@
+ mvn\:org.apache.felix/org.apache.felix.fileinstall/3.5.8 = 11
+ mvn\:org.ops4j.pax.url/pax-url-aether/2.5.2 = 5
+ mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.0.9 = 15
++mvn\:org.osgi/org.osgi.service.event/1.3.1 = 7