Bug 7891: Place provided features to featuresBoot

Specifically, org.apache.sshd/sshd-core/0.14.0 is excluded,
thus "ssh" feature has to be always installed.

Without this, distribution4-check with odl-netconf-mdsal
in integration fails at installing boot features, because
org.opendaylight.netconf.netty-util depends on sshd-core bundle,
which is only activated by "ssh" feature
(as any ODL feature drops that dependency,
because of exclusions in feature parents).

Change-Id: Ic1d3b19981fccca9c320a5079aaf9e2eadf09397
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index 4c0b0b3e22da457c53587e6951bd53740ae668eb..7d83b5eb56b240251a21a2e8a1a6111970505488 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -258,6 +258,8 @@
                         <!-- We load wrap as a workaround to handle old features without the wrap prerequisite -->
                         <!-- TODO Remove this once all the downstream features are fixed -->
                         <feature>wrap</feature>
+                        <!-- Features always assumed to be present. Keep in sync with feature parent exclusions. -->
+                        <feature>ssh</feature>
                         <!-- Local feature if any -->
                         <feature>${karaf.localFeature}</feature>
                     </bootFeatures>

diff --git a/untested-single-feature-parent/pom.xml b/untested-single-feature-parent/pom.xml
index 9ad93b5a1ace2cad7396fceb9a8c89731c1da3f0..d88fc03d8164beb6c278d8b5102dd1acf41696ca 100644 (file)
--- a/untested-single-feature-parent/pom.xml
+++ b/untested-single-feature-parent/pom.xml
@@ -52,7 +52,8 @@
                 <configuration combine.children="append">
                     <simplifyBundleDependencies>true</simplifyBundleDependencies>
                     <excludedArtifactIds>
-                        <!-- These artifacts are provided by our Karaf distribution -->
+                        <!-- These artifacts are provided by our Karaf distribution. -->
+                        <!-- Keep in synch with karaf parent minimal bootFeatures. -->
                         <!-- Aries Blueprint -->
                         <excludedArtifactId>org.apache.aries.blueprint.api</excludedArtifactId>
                         <excludedArtifactId>org.apache.aries.blueprint.core</excludedArtifactId>