Use equinox instead of felix for SFT 82/51482/2
authorRobert Varga <rovarga@cisco.com>
Mon, 6 Feb 2017 20:28:19 +0000 (21:28 +0100)
committerStephen Kitt <skitt@redhat.com>
Tue, 7 Feb 2017 08:11:48 +0000 (08:11 +0000)
Default felix has some problem with attaching optional imports,
breaking downstream features. Switch to using equinox, which is
actually what we package.

Change-Id: I6813f2a5e3d9343fb59ec52d12e0367ca07f71b9
Signed-off-by: Robert Varga <rovarga@cisco.com>
features4-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java

index 2773d7b970dc30003f32404ac9535f5114a14c69..26101020a4bb3f43711b8a39270857a58fc6e1b2 100644 (file)
@@ -161,6 +161,7 @@ public class SingleFeatureTest {
             mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api", "1.0.0"),
             editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, LOG4J_LOGGER_ORG_OPENDAYLIGHT_YANGTOOLS_FEATURETEST,
                     LogLevel.INFO.name()),
+            editConfigurationFilePut("etc/config.properties", "karaf.framework", "equinox"),
             editConfigurationFilePut(ETC_ORG_OPS4J_PAX_LOGGING_CFG, "log4j.rootLogger", "INFO, stdout, osgi:*"),
              /*
               *