From 1254e0f95ed295bfa7fb1189ee52749d927d0968 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan-Simon=20M=C3=B6ller?= Date: Fri, 31 Jul 2015 21:22:46 +0200 Subject: [PATCH] Backport mvn archetypes to stable/lithium. Based on commits to master from Ed Warnicke v2: imported 24728 - whitespace fixes. Change-Id: I4da6a343fab5d3072e7dec224da01a9a830e214a Signed-off-by: Jan-Simon Moeller --- .gitignore | 3 +- karaf/karaf-parent/pom.xml | 39 ++-- .../META-INF/maven/archetype-metadata.xml | 14 ++ .../archetype-resources/features/pom.xml | 9 + .../features/src/main/features/features.xml | 2 + .../impl/__classPrefix__ProviderTest.java | 37 ---- .../resources/archetype-resources/it/pom.xml | 41 ++++ .../it/__classPrefix__IT.java | 73 ++++++++ .../archetype-resources/karaf/pom.xml | 7 - .../resources/archetype-resources/pom.xml | 1 + opendaylight/config/config-it-base/pom.xml | 85 +++++++++ .../it/base/AbstractConfigTestBase.java | 173 +++++++++++++++++ opendaylight/config/pom.xml | 1 + opendaylight/md-sal/mdsal-it-base/pom.xml | 95 ++++++++++ .../mdsal/it/base/AbstractMdsalTestBase.java | 75 ++++++++ opendaylight/md-sal/mdsal-it-parent/pom.xml | 177 ++++++++++++++++++ opendaylight/md-sal/pom.xml | 9 + 17 files changed, 778 insertions(+), 63 deletions(-) delete mode 100644 opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/test/java/__packageInPathFormat__/impl/__classPrefix__ProviderTest.java create mode 100644 opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml create mode 100644 opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__IT.java create mode 100644 opendaylight/config/config-it-base/pom.xml create mode 100644 opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java create mode 100644 opendaylight/md-sal/mdsal-it-base/pom.xml create mode 100644 opendaylight/md-sal/mdsal-it-base/src/main/java/org/opendaylight/controller/mdsal/it/base/AbstractMdsalTestBase.java create mode 100644 opendaylight/md-sal/mdsal-it-parent/pom.xml diff --git a/.gitignore b/.gitignore index b304ffce87..ead1f8ee02 100644 --- a/.gitignore +++ b/.gitignore @@ -29,5 +29,4 @@ maven-eclipse.xml .metadata opendaylight/md-sal/sal-distributed-datastore/journal !opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/bin - - +.checkstyle diff --git a/karaf/karaf-parent/pom.xml b/karaf/karaf-parent/pom.xml index 568032f31e..b3e8e2cb52 100644 --- a/karaf/karaf-parent/pom.xml +++ b/karaf/karaf-parent/pom.xml @@ -23,6 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 1.1.1-SNAPSHOT 1.5.1-SNAPSHOT + 1.5.1-SNAPSHOT standard + + it + + pom.xml + + + + it/src/test/java + + **/*.java + + diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml index 11536d8c5f..f6cd4151c6 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml @@ -26,6 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 1.2.1-SNAPSHOT 0.7.1-SNAPSHOT + 0.2.1-SNAPSHOT etc/opendaylight/karaf @@ -65,6 +66,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL xml runtime + + org.opendaylight.dlux + features-dlux + features + ${dlux.version} + xml + runtime + ${symbol_dollar}{project.groupId} ${artifactId}-impl diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml index 1facf4c8aa..1e3115d531 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml @@ -16,6 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html mvn:org.opendaylight.yangtools/features-yangtools/${symbol_dollar}{yangtools.version}/xml/features mvn:org.opendaylight.controller/features-mdsal/${symbol_dollar}{mdsal.version}/xml/features mvn:org.opendaylight.controller/features-restconf/${symbol_dollar}{mdsal.version}/xml/features + mvn:org.opendaylight.dlux/features-dlux/${symbol_dollar}{dlux.version}/xml/features odl-yangtools-models mvn:${groupId}/${artifactId}-api/${symbol_dollar}{project.version} @@ -34,6 +35,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html odl-${artifactId}-rest odl-mdsal-apidocs odl-mdsal-xsql + odl-dlux-yangui diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/test/java/__packageInPathFormat__/impl/__classPrefix__ProviderTest.java b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/test/java/__packageInPathFormat__/impl/__classPrefix__ProviderTest.java deleted file mode 100644 index 09b3dc4622..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/test/java/__packageInPathFormat__/impl/__classPrefix__ProviderTest.java +++ /dev/null @@ -1,37 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -#set( $provider = "${classPrefix}Provider" ) -/* - * ${copyright} and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package ${package}.impl; - -import org.junit.Test; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; - -import static org.mockito.Mockito.mock; - -public class ${classPrefix}ProviderTest { - @Test - public void testOnSessionInitiated() { - ${provider} provider = new ${provider}(); - - // ensure no exceptions - // currently this method is empty - provider.onSessionInitiated(mock(BindingAwareBroker.ProviderContext.class)); - } - - @Test - public void testClose() throws Exception { - ${provider} provider = new ${provider}(); - - // ensure no exceptions - // currently this method is empty - provider.close(); - } -} diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml new file mode 100644 index 0000000000..b60b82638f --- /dev/null +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml @@ -0,0 +1,41 @@ + + + + + + + org.opendaylight.controller + mdsal-it-parent + 1.3.0-SNAPSHOT + + + + 4.0.0 + ${groupId} + ${artifactId}-it + ${version} + bundle + + + false + org.opendaylight.${artifactId} + ${artifactId}-karaf + ${version} + zip + + + + + ${project.groupId} + ${artifactId}-features + ${project.version} + + + + \ No newline at end of file diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__IT.java b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__IT.java new file mode 100644 index 0000000000..eda5e733ac --- /dev/null +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__IT.java @@ -0,0 +1,73 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +/* + * ${copyright} and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package ${package}.it; + +import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.maven; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.junit.PaxExam; +import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; +import org.ops4j.pax.exam.options.MavenUrlReference; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@RunWith(PaxExam.class) +@ExamReactorStrategy(PerClass.class) +public class ${classPrefix}IT extends AbstractMdsalTestBase { + private static final Logger LOG = LoggerFactory.getLogger(${classPrefix}IT.class); + + @Override + public String getModuleName() { + return "${artifactId}"; + } + + @Override + public String getInstanceName() { + return "${artifactId}-default"; + } + + @Override + public MavenUrlReference getFeatureRepo() { + return maven() + .groupId("${groupId}") + .artifactId("${artifactId}-features") + .classifier("features") + .type("xml") + .versionAsInProject(); + } + + @Override + public String getFeatureName() { + return "odl-${artifactId}-ui"; + } + + @Override + public Option getLoggingOption() { + Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, + logConfiguration(${classPrefix}IT.class), + LogLevel.INFO.name()); + option = composite(option, super.getLoggingOption()); + return option; + } + + @Test + public void test${artifactId}FeatureLoad() { + Assert.assertTrue(true); + } +} diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml index d3ba24b21c..ee1932eba9 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml @@ -64,13 +64,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL true - - org.apache.maven.plugins - maven-install-plugin - - true - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml index 49f489379c..cc2352f026 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml @@ -28,6 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL karaf features artifacts + it diff --git a/opendaylight/config/config-it-base/pom.xml b/opendaylight/config/config-it-base/pom.xml new file mode 100644 index 0000000000..def8cd3fd3 --- /dev/null +++ b/opendaylight/config/config-it-base/pom.xml @@ -0,0 +1,85 @@ + + + + + + org.opendaylight.controller + config-parent + 0.4.0-SNAPSHOT + + + 4.0.0 + config-it-base + bundle + + + + org.opendaylight.controller + config-artifacts + ${project.version} + pom + import + + + + + + org.opendaylight.controller + config-util + + + + org.ops4j.pax.exam + pax-exam-container-karaf + compile + + + org.ops4j.pax.exam + pax-exam-junit4 + compile + + + org.ops4j.pax.exam + pax-exam + compile + + + org.ops4j.pax.url + pax-url-aether + compile + + + javax.inject + javax.inject + 1 + compile + + + org.apache.karaf.features + org.apache.karaf.features.core + ${karaf.version} + compile + + + org.osgi + org.osgi.core + compile + + + junit + junit + compile + + + org.apache.karaf.tooling + karaf-maven-plugin + ${karaf.version} + + + 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 new file mode 100644 index 0000000000..e581e50247 --- /dev/null +++ b/opendaylight/config/config-it-base/src/main/java/org/opendaylight/controller/config/it/base/AbstractConfigTestBase.java @@ -0,0 +1,173 @@ +package org.opendaylight.controller.config.it.base; + +import static org.ops4j.pax.exam.CoreOptions.maven; +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; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder; + +import com.google.common.base.Stopwatch; + +import java.io.File; +import java.lang.management.ManagementFactory; +import java.util.concurrent.TimeUnit; + +import javax.management.ObjectName; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.internal.AssumptionViolatedException; +import org.junit.rules.TestRule; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; +import org.opendaylight.controller.config.api.ConfigRegistry; +import org.opendaylight.controller.config.util.ConfigRegistryJMXClient; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.karaf.options.KarafDistributionOption; +import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; +import org.ops4j.pax.exam.options.MavenArtifactUrlReference; +import org.ops4j.pax.exam.options.MavenUrlReference; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public abstract class AbstractConfigTestBase { + + private static final String PAX_EXAM_UNPACK_DIRECTORY = "target/exam"; + private static final String KARAF_DEBUG_PORT = "5005"; + private static final String KARAF_DEBUG_PROP = "karaf.debug"; + private static final String KEEP_UNPACK_DIRECTORY_PROP = "karaf.keep.unpack"; + private static final Logger LOG = LoggerFactory.getLogger(AbstractConfigTestBase.class); + public static final String ORG_OPS4J_PAX_LOGGING_CFG = "etc/org.ops4j.pax.logging.cfg"; + + /* + * Default values for karaf distro version, type, groupId, and artifactId + */ + private static final String KARAF_DISTRO_VERSION = "3.0.2"; + private static final String KARAF_DISTRO_TYPE = "zip"; + private static final String KARAF_DISTRO_ARTIFACTID = "apache-karaf"; + private static final String KARAF_DISTRO_GROUPID = "org.apache.karaf"; + + /* + * Property names to override defaults for karaf distro artifactId, groupId, version, and type + */ + private static final String KARAF_DISTRO_VERSION_PROP = "karaf.distro.version"; + private static final String KARAF_DISTRO_TYPE_PROP = "karaf.distro.type"; + private static final String KARAF_DISTRO_ARTIFACTID_PROP = "karaf.distro.artifactId"; + private static final String KARAF_DISTRO_GROUPID_PROP = "karaf.distro.groupId"; + + /* + * Wait up to 10s for our configured module to come up + */ + private static final int MODULE_TIMEOUT_MILLIS = 60000; + + public abstract String getModuleName(); + + public abstract String getInstanceName(); + + public abstract MavenUrlReference getFeatureRepo(); + + public abstract String getFeatureName(); + + public Option getLoggingOption() { + Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, + logConfiguration(AbstractConfigTestBase.class), + LogLevel.INFO.name()); + return option; + } + + public String logConfiguration(Class klazz) { + return "log4j.logger." + klazz.getPackage().getName(); + } + + public String getKarafDistro() { + String groupId = System.getProperty(KARAF_DISTRO_GROUPID_PROP,KARAF_DISTRO_GROUPID); + String artifactId = System.getProperty(KARAF_DISTRO_ARTIFACTID_PROP,KARAF_DISTRO_ARTIFACTID); + String version = System.getProperty(KARAF_DISTRO_VERSION_PROP,KARAF_DISTRO_VERSION); + String type = System.getProperty(KARAF_DISTRO_TYPE_PROP,KARAF_DISTRO_TYPE); + MavenArtifactUrlReference karafUrl = maven() + .groupId(groupId) + .artifactId(artifactId) + .version(version) + .type(type); + return karafUrl.getURL(); + } + + @Configuration + public Option[] config() { + Option[] options = new Option[] { + when(Boolean.getBoolean(KARAF_DEBUG_PROP)) + .useOptions(KarafDistributionOption.debugConfiguration(KARAF_DEBUG_PORT, true)), + karafDistributionConfiguration().frameworkUrl(getKarafDistro()) + .unpackDirectory(new File(PAX_EXAM_UNPACK_DIRECTORY)) + .useDeployFolder(false), + when(Boolean.getBoolean(KEEP_UNPACK_DIRECTORY_PROP)).useOptions(keepRuntimeFolder()), + features(getFeatureRepo(), getFeatureName()), + getLoggingOption()}; + return options; + } + + @Before + public void setup() throws Exception { + LOG.info("Module: {} Instance: {} attempting to configure.", + getModuleName(),getInstanceName()); + Stopwatch stopWatch = Stopwatch.createStarted(); + ObjectName objectName = null; + for(int i = 0;iconfig-artifacts config-parent + config-it-base diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml new file mode 100644 index 0000000000..50d054ff8c --- /dev/null +++ b/opendaylight/md-sal/mdsal-it-base/pom.xml @@ -0,0 +1,95 @@ + + + + + + org.opendaylight.controller + config-parent + 0.4.0-SNAPSHOT + + + 4.0.0 + mdsal-it-base + 1.3.0-SNAPSHOT + bundle + + 0.4.0-SNAPSHOT + + + + + ${project.groupId} + mdsal-artifacts + ${project.version} + pom + import + + + + + + ${project.groupId} + config-it-base + ${config.version} + compile + + + ${project.groupId} + sal-binding-api + + + + org.ops4j.pax.exam + pax-exam-container-karaf + compile + + + org.ops4j.pax.exam + pax-exam-junit4 + compile + + + org.ops4j.pax.exam + pax-exam + compile + + + org.ops4j.pax.url + pax-url-aether + compile + + + javax.inject + javax.inject + 1 + compile + + + org.apache.karaf.features + org.apache.karaf.features.core + ${karaf.version} + compile + + + org.osgi + org.osgi.core + compile + + + junit + junit + compile + + + org.apache.karaf.tooling + karaf-maven-plugin + ${karaf.version} + + + diff --git a/opendaylight/md-sal/mdsal-it-base/src/main/java/org/opendaylight/controller/mdsal/it/base/AbstractMdsalTestBase.java b/opendaylight/md-sal/mdsal-it-base/src/main/java/org/opendaylight/controller/mdsal/it/base/AbstractMdsalTestBase.java new file mode 100644 index 0000000000..34728a99fb --- /dev/null +++ b/opendaylight/md-sal/mdsal-it-base/src/main/java/org/opendaylight/controller/mdsal/it/base/AbstractMdsalTestBase.java @@ -0,0 +1,75 @@ +package org.opendaylight.controller.mdsal.it.base; + +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; +import static org.ops4j.pax.exam.CoreOptions.composite; + +import java.util.Calendar; + +import javax.inject.Inject; + +import org.junit.Before; +import org.opendaylight.controller.config.it.base.AbstractConfigTestBase; +import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; +import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; +import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; +import org.ops4j.pax.exam.util.Filter; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public abstract class AbstractMdsalTestBase extends AbstractConfigTestBase implements BindingAwareProvider { + + private static final Logger LOG = LoggerFactory.getLogger(AbstractMdsalTestBase.class); + private static final int REGISTRATION_TIMEOUT = 70000; + @Inject @Filter(timeout=60000) + private BundleContext context; + private ProviderContext session = null; + + public ProviderContext getSession() { + return session; + } + + @Override + public void onSessionInitiated(ProviderContext session) { + LOG.info("Session Initiated: {}",session); + this.session = session; + } + + @Override + @Before + public void setup() throws Exception { + super.setup(); + Calendar start = Calendar.getInstance(); + ServiceReference serviceReference = context.getServiceReference(BindingAwareBroker.class); + if(serviceReference == null) { + throw new RuntimeException("BindingAwareBroker not found"); + } + BindingAwareBroker broker = context.getService(serviceReference); + broker.registerProvider(this); + for(int i=0;i + + + + + org.opendaylight.controller + config-parent + 0.4.0-SNAPSHOT + + + 4.0.0 + mdsal-it-parent + 1.3.0-SNAPSHOT + pom + + org.opendaylight.controller + opendaylight-karaf-empty + 1.6.0-SNAPSHOT + zip + false + + + + + org.opendaylight.controller + mdsal-artifacts + ${mdsal.version} + pom + import + + + + + + + org.opendaylight.controller + mdsal-it-base + ${mdsal.version} + + + + + org.ops4j.pax.exam + pax-exam-container-karaf + + + org.ops4j.pax.exam + pax-exam-junit4 + + + org.ops4j.pax.exam + pax-exam + + + org.ops4j.pax.url + pax-url-aether + + + javax.inject + javax.inject + 1 + + + org.apache.karaf.features + org.apache.karaf.features.core + ${karaf.version} + + + org.osgi + org.osgi.core + + + junit + junit + + + org.apache.karaf.tooling + karaf-maven-plugin + ${karaf.version} + + + + + junit + junit + test + + + + org.mockito + mockito-all + test + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + karaf.distro.groupId + ${karaf.distro.groupId} + + + karaf.distro.artifactId + ${karaf.distro.artifactId} + + + karaf.distro.version + ${karaf.distro.version} + + + karaf.distro.type + ${karaf.distro.type} + + + karaf.keep.unpack + ${karaf.keep.unpack} + + + ${project.build.directory}/surefire-reports + + + + + + + org.apache.servicemix.tooling + depends-maven-plugin + + + generate-depends-file + + generate-depends-file + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-karaf-resources + + unpack-dependencies + + process-test-resources + + ${project.build.directory}/test-classes + org.opendaylight.controller + config-it-base,mdsal-it-base + META-INF\/** + false + + + + + + + diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 5cd8df2c11..23676b7681 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -87,6 +87,15 @@ messagebus-spi messagebus-impl messagebus-config + + + sal-binding-it + sal-binding-dom-it + + + mdsal-it-base + mdsal-it-parent + -- 2.36.6