Mark aries.quiesce.api is not being available by default

This patch supports integration with Blueprint: controller's extender
can rely on this to be bound. Once that dependency is away, we will
remove this patch.

JIRA: ODLPARENT-298
Change-Id: I426790587cd414425d7ea007e8cf815b215e716d
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 550d2770159c37aa05134118ba589c4a71feb352..e54826c30324aa95394349f83084819c3bb1e8be 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -115,6 +115,7 @@
                        failonerror="true"/>
                 <copy file="${project.build.directory}/assembly/bin/karaf.bat"
                       tofile="${project.build.directory}/classes/bin/karaf.bat"/>
+                <!-- FIXME: ODLPARENT-298: remove this instruction -->
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-quiesce.patch"
                        originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                        failonerror="true"/>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce.patch
index 1b39ef3574517c84345420bdfeaaccca022dace4..2b8dc654ae1233af36c30938504c52f7056383ee 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce.patch
@@ -1,9 +1,10 @@
 --- system/org/apache/karaf/features/standard/4.2.0/standard-4.2.0-features.xml.orig   2018-04-03 17:14:22.174264512 +0200
 +++ system/org/apache/karaf/features/standard/4.2.0/standard-4.2.0-features.xml        2018-04-03 17:25:24.387151126 +0200
-@@ -48,6 +48,7 @@
+@@ -48,6 +48,8 @@
          <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.api/1.0.1</bundle>
          <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/1.3.2</bundle>
          <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/1.10.3</bundle>
++        <!-- NOTE: This is going away as part of https://jira.opendaylight.org/browse/ODLPARENT-298 -->
 +        <bundle start-level="20">mvn:org.apache.aries.quiesce/org.apache.aries.quiesce.api/1.0.0</bundle>
          <conditional>
              <condition>bundle</condition>