BUG-8208: remove prereq from jdbc/jetty features

It seems that dependencies have to be completely converged
and prerequisite=true does not play nice with optional imports,
leading to half-baked installation.

This patch drops dependency/prerequisite flags, which will need
to be revisited once we have this thing working.

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

diff --git a/features4/odl-karaf-feat-jdbc/src/main/feature/feature.xml b/features4/odl-karaf-feat-jdbc/src/main/feature/feature.xml
index 2813eefcc99d2d9d53ef2b174d31173f2828f70c..46af0fc911748a42fffd2a6451387ebbc982399a 100644 (file)
--- a/features4/odl-karaf-feat-jdbc/src/main/feature/feature.xml
+++ b/features4/odl-karaf-feat-jdbc/src/main/feature/feature.xml
@@ -10,6 +10,6 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-karaf-feat-jdbc">
     <repository>mvn:org.apache.karaf.features/enterprise/${karaf4.version}/xml/features</repository>
     <feature name="odl-karaf-feat-jdbc" version="${project.version}">
-        <feature dependency="true" prerequisite="true">jdbc</feature>
+        <feature dependency="false" prerequisite="false">jdbc</feature>
     </feature>
 </features>

diff --git a/features4/odl-karaf-feat-jetty/src/main/feature/feature.xml b/features4/odl-karaf-feat-jetty/src/main/feature/feature.xml
index 1957223a48289c76c7b3724379075416164d98d3..159079b5f6e09446e0201fe0ed58505ea3a0bd4e 100644 (file)
--- a/features4/odl-karaf-feat-jetty/src/main/feature/feature.xml
+++ b/features4/odl-karaf-feat-jetty/src/main/feature/feature.xml
@@ -9,6 +9,6 @@
 -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-karaf-feat-jetty">
     <feature name="odl-karaf-feat-jetty" version="${project.version}">
-        <feature dependency="true" prerequisite="true">war</feature>
+        <feature dependency="false" prerequisite="false">war</feature>
     </feature>
 </features>