Move odl-toaster to experimental features

odl-toaster is not a production feature, move it to experimental
features.

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

diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml
index db0d9fda899e7b2ae72c7efc51dcafd73954cccb..6bf6e22d941b114b0310496495773f8da5217815 100644 (file)
--- a/features/features-controller-experimental/pom.xml
+++ b/features/features-controller-experimental/pom.xml
@@ -47,5 +47,11 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-toaster</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml
index 4cc47ae5b72ddb9d481c7d66ccc3f0f6bf0a4893..d93b6b37abc4c8eeffca48d7a9a6b779a08d1284 100644 (file)
--- a/features/features-controller/pom.xml
+++ b/features/features-controller/pom.xml
@@ -83,12 +83,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-toaster</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-controller-blueprint</artifactId>

diff --git a/opendaylight/md-sal/samples/toaster-it/pom.xml b/opendaylight/md-sal/samples/toaster-it/pom.xml
index 35b782b918626cc552736bfdc336021f105e9e14..44f04d3e372429d646bcab990f97b8abeae374ee 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-it/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-it/pom.xml
@@ -13,7 +13,7 @@
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-controller</artifactId>
+      <artifactId>features-controller-experimental</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>

diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
index bb0bdd95427a6c92f52a620a26db9016c2ed8411..ed2e47b0619c240e1e1115ebb4cb5577dc8ef4ba 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
+++ b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
@@ -34,8 +34,8 @@ public class ToasterTest extends AbstractMdsalTestBase {
 
     @Override
     public MavenUrlReference getFeatureRepo() {
-        return maven().groupId("org.opendaylight.controller").artifactId("features-controller").classifier("features")
-                .type("xml").versionAsInProject();
+        return maven().groupId("org.opendaylight.controller").artifactId("features-controller-experimental")
+                .classifier("features").type("xml").versionAsInProject();
     }
 
     @Override