From 8436ef0ad486efbf1b9f4e7ab3e9813eca4eff31 Mon Sep 17 00:00:00 2001 From: Lorand Jakab Date: Wed, 22 Feb 2017 22:47:25 +0200 Subject: [PATCH] Prepare config-it-base for Karaf 4 Downstreams using mdsal-it-parent as their integration test parent will not be able to migrate their IT to a Karaf 4 based distribution without this change. See also https://git.opendaylight.org/gerrit/#/c/51450/ Change-Id: I572151bcf16fb9864f59dd446952ab13a12b295f Signed-off-by: Lorand Jakab --- .../controller/config/it/base/AbstractConfigTestBase.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java b/opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java index f0ff87e6ed..d76bda25f2 100644 --- a/opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java +++ b/opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java @@ -9,6 +9,7 @@ package org.opendaylight.controller.config.it.base; import static org.ops4j.pax.exam.CoreOptions.maven; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.when; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features; @@ -164,6 +165,7 @@ public abstract class AbstractConfigTestBase { .useDeployFolder(false), when(Boolean.getBoolean(KEEP_UNPACK_DIRECTORY_PROP)).useOptions(keepRuntimeFolder()), features(getFeatureRepo(), getFeatureName()), + mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api", "1.0.0"), getLoggingOption(), mvnLocalRepoOption(), editConfigurationFilePut(ETC_ORG_OPS4J_PAX_LOGGING_CFG, "log4j.rootLogger", "INFO, stdout, osgi:*")}; -- 2.36.6