Fix karaf4 features

Features should be pulling in transitive dependencies from
the corresponding features. Fix that.

Change-Id: Ib758202ad0ff03e3a44b8a040dcc72f241c59920
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 86388150d7239e6430503752f312707bf63d07b6)

diff --git a/bgp/cli/pom.xml b/bgp/cli/pom.xml
index 75222a46a248ee45f13430a94dab00f4255b4272..3c3bd51e1fd1336949aa504382054590c4d4e5a3 100644 (file)
--- a/bgp/cli/pom.xml
+++ b/bgp/cli/pom.xml
@@ -68,16 +68,19 @@
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.console</artifactId>
             <version>${karaf.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.table</artifactId>
             <version>${karaf.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.commands</artifactId>
             <version>${karaf.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -91,6 +94,27 @@
          </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <!-- This bundle works with Karaf 3 and 4.0, see https://wiki.opendaylight.org/view/Karaf_4_migration#Karaf_CLI_commands -->
+                        <Import-Package>
+                            org.apache.karaf.shell.commands;version="[3.0.0,4.1)",
+                            org.apache.karaf.shell.console;version="[3.0.0,4.1)",
+                            org.apache.karaf.shell.table;version="[3.0.0,4.1)",
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/bgpcep.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/bgpcep.git</developerConnection>

diff --git a/features/bgp/features4-bgp/pom.xml b/features/bgp/features4-bgp/pom.xml
index 5b0896a66856b8f94226b091187ce81ce015ef12..3e0cb3a85d4fe52de84e4d7eefca31625828699e 100644 (file)
--- a/features/bgp/features4-bgp/pom.xml
+++ b/features/bgp/features4-bgp/pom.xml
@@ -34,133 +34,114 @@
             <artifactId>odl-bgpcep-bgp</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-config-files</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-dependencies</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-inet</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-parser</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-linkstate</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-flowspec</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-labeled-unicast</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-l3vpn</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-evpn</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-path-selection-mode</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-impl</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-topology</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-benchmark</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-cli</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-config-loader</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-openconfig-state</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -179,4 +160,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml b/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
index 89021b2ffeb137e1552cc7bbb61053b0825c3ede..26ee034dd27f14d40f7569d10b44c3829381d0a5 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
@@ -52,14 +52,12 @@
             <artifactId>odl-bgpcep-bgp-inet</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -78,4 +76,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-cli/pom.xml b/features/bgp/odl-bgpcep-bgp-cli/pom.xml
index 0cb0730c855eb1f0d9e93f59dd181f62fb467423..3ded7e932437910ba575fc4a931fb45904877a23 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-cli/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-cli/pom.xml
@@ -40,7 +40,6 @@
             <artifactId>odl-bgpcep-bgp-rib-impl</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -59,4 +58,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml b/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml
index 864695ba984c6c6e588771fcfa7c8e315fe03ab6..e143d63c50533cc0a40eb30fbfad6c28db4522e9 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml
@@ -33,10 +33,10 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>features-mdsal</artifactId>
+                <artifactId>mdsal-artifacts</artifactId>
                 <version>${mdsal.common.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -55,7 +55,12 @@
             <artifactId>odl-bgpcep-config-files</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-binding-runtime</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
     </dependencies>
 
@@ -74,4 +79,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml b/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml
index d4aae21318876e3f78f642fcebcb3fdd0c069957..d170988eed70e2f2b0fd2785d0c430efcd3e5e90 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml
@@ -78,21 +78,18 @@
             <artifactId>odl-mdsal-models</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-yang-data</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-netty-4</artifactId>
+            <artifactId>odl4-netty-4</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -111,4 +108,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-evpn/pom.xml b/features/bgp/odl-bgpcep-bgp-evpn/pom.xml
index 599ca99a4d2eef5d1dc061698c0ddbcc52146b0b..106edd64152989cacc1b8d4a91b41540ab3b4531 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-evpn/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-evpn/pom.xml
@@ -44,21 +44,18 @@
             <artifactId>odl-bgpcep-bgp-parser</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -78,4 +75,4 @@
         </site>
     </distributionManagement>
     
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml b/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml
index 05dba30ebb0c51ab20c2b620db73a75429f73373..4a68ef00925531ebb051afe8647c48587df57bcb 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml
@@ -44,28 +44,24 @@
             <artifactId>odl-bgpcep-bgp-parser</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-inet</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -84,4 +80,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-inet/pom.xml b/features/bgp/odl-bgpcep-bgp-inet/pom.xml
index bd7f5489306eeba86a8d76b409742bb532cb7a2a..58984a6108b089cbf7cabdafb04b01941b2ac404 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-inet/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-inet/pom.xml
@@ -44,21 +44,18 @@
             <artifactId>odl-bgpcep-bgp-parser</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -77,4 +74,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml b/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml
index 15740351326c6755b09c9c0b886e8a59e73f3512..c91c5973ffae6e471b3bea93f5423e8917afb056 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml
@@ -44,28 +44,24 @@
             <artifactId>odl-bgpcep-bgp-parser</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-labeled-unicast</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -84,4 +80,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml b/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml
index c0f6ae9b1a4c5210649440a13cbd18244af899d9..190fc55d05713de180c3094602b3eb5e15700a45 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml
@@ -44,28 +44,24 @@
             <artifactId>odl-bgpcep-bgp-parser</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-inet</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -84,4 +80,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml b/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
index 66a580f3bfa8b090a4419a9a71e8f510159b2d81..6bb6bd84445d20056fd0ed48a88e9429f6a9107e 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
@@ -44,28 +44,24 @@
             <artifactId>odl-bgpcep-bgp-parser</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-rsvp</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -84,4 +80,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml b/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml
index 392cb5a7bb62fdf1e79c040683c5fdf197fca9f0..17116333a267cac4040270ce9e2c1bf1d20b33e0 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml
@@ -40,7 +40,6 @@
             <artifactId>odl-bgpcep-bgp-rib-impl</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -59,4 +58,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml b/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml
index 4dc5c05ad1042bb9a7dfb3061f5be7e08c02623e..6aa9942752f207990346978c0833719dc62e0ad1 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml
@@ -44,14 +44,12 @@
             <artifactId>odl-bgpcep-bgp-parser</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -70,4 +68,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-parser/pom.xml b/features/bgp/odl-bgpcep-bgp-parser/pom.xml
index 8b3bee0ccc3fa30b7ba558a6a645b9852e12bffb..fcba260710476e61d35500f0b40ce59611d1fae0 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-parser/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-parser/pom.xml
@@ -69,21 +69,18 @@
             <artifactId>odl-bgpcep-bgp-dependencies</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-api</artifactId>
+            <artifactId>odl-config-core</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-yang-data</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -102,4 +99,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml b/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml
index 0f3f1b2841ecfcc997155089797c9a7f1f38f497..64b8200347d37b711850db7f0d433a76a1a31f06 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml
@@ -56,21 +56,18 @@
             <artifactId>odl-bgpcep-bgp-dependencies</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -89,4 +86,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
index cb4f943c6197f86fe7a0608a4971d7a253079282..d1f385274fa58fbf9e9fbd82a0b27e2e5d3cd338 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
@@ -72,21 +72,18 @@
             <artifactId>odl-bgpcep-bgp-dependencies</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-netty-config-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -105,4 +102,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
index 2b5a349cf43549da11f6c033e4c09a021ee93526..1624985c52458280c468e682aec75292a55576da 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
@@ -72,42 +72,36 @@
             <artifactId>odl-bgpcep-bgp-dependencies</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-inet</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-path-selection-mode</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-config-loader</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -126,4 +120,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-topology/pom.xml b/features/bgp/odl-bgpcep-bgp-topology/pom.xml
index bfeb5313dbb4537b0c6f5425cde95d907a2ecff9..3dc22324112b7d65da7db16889b2b08e261436c2 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-topology/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-topology/pom.xml
@@ -56,28 +56,24 @@
             <artifactId>odl-bgpcep-bgp-inet</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-linkstate</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-config-loader</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -96,4 +92,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp/pom.xml b/features/bgp/odl-bgpcep-bgp/pom.xml
index 3991083c430498874af83d96421aa565385f47a4..20b1d35252388ce77ed82a1a8b99e22a8ca98f36 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp/pom.xml
@@ -36,112 +36,96 @@
             <artifactId>odl-bgpcep-bgp-parser</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-impl</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-openconfig-state</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-path-selection-mode</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-topology</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-cli</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-config-files</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-inet</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-linkstate</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-flowspec</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-labeled-unicast</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-l3vpn</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-evpn</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-controller-config</artifactId>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -160,4 +144,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bgp/odl-bgpcep-config-files/pom.xml b/features/bgp/odl-bgpcep-config-files/pom.xml
index bb37eb368246b2cf8b8199203b0bd05e36f5ca27..28cdda8d6305f481016e098109a531bf5bf59516 100644 (file)
--- a/features/bgp/odl-bgpcep-config-files/pom.xml
+++ b/features/bgp/odl-bgpcep-config-files/pom.xml
@@ -36,14 +36,12 @@
             <artifactId>bgp-controller-config</artifactId>
             <type>xml</type>
             <classifier>bgp-initial-config</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-controller-config</artifactId>
             <type>xml</type>
             <classifier>network-topology-initial-config</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -62,4 +60,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bmp/features4-bmp/pom.xml b/features/bmp/features4-bmp/pom.xml
index 1637fad2fb6c728c6761f1f353d7239cfc81656a..9be53ff24ed3f0be194deea06cd56b69569b09a1 100644 (file)
--- a/features/bmp/features4-bmp/pom.xml
+++ b/features/bmp/features4-bmp/pom.xml
@@ -33,7 +33,6 @@
             <artifactId>odl-bgpcep-bmp</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -52,4 +51,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/bmp/odl-bgpcep-bmp/pom.xml b/features/bmp/odl-bgpcep-bmp/pom.xml
index 6fb004601e7b7c0eaa3ce073d0c7e1e0010b215b..d58ca17678b4f04e167be658d87cb990afa4716d 100644 (file)
--- a/features/bmp/odl-bgpcep-bmp/pom.xml
+++ b/features/bmp/odl-bgpcep-bmp/pom.xml
@@ -72,112 +72,96 @@
             <artifactId>odl-bgpcep-bgp-dependencies</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-parser</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-impl</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-linkstate</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-flowspec</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-labeled-unicast</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-l3vpn</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-evpn</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-netty</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-netty-config-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-controller-config</artifactId>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-controller-config</artifactId>
             <type>xml</type>
             <classifier>bmp-config</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-controller-config</artifactId>
             <type>xml</type>
             <classifier>bmp-config-example</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -196,4 +180,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/extras/features4-extras/pom.xml b/features/extras/features4-extras/pom.xml
index 3c50e58cf287e0a279558734d33ac8b59d0ddef5..f56d70d1445f5b964913e5edddf98fd6ef05358c 100644 (file)
--- a/features/extras/features4-extras/pom.xml
+++ b/features/extras/features4-extras/pom.xml
@@ -34,14 +34,12 @@
             <artifactId>odl-bgpcep-extras-dependencies</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-data-change-counter</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -60,4 +58,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/extras/odl-bgpcep-data-change-counter/pom.xml b/features/extras/odl-bgpcep-data-change-counter/pom.xml
index 8c91706f2c30f709953e2a0c07b5557893a07da3..0600ac9bf24f254580482d39d8fcb01b889e36dc 100644 (file)
--- a/features/extras/odl-bgpcep-data-change-counter/pom.xml
+++ b/features/extras/odl-bgpcep-data-change-counter/pom.xml
@@ -60,28 +60,24 @@
             <artifactId>odl-bgpcep-extras-dependencies</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-api</artifactId>
+            <artifactId>odl-config-core</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>data-change-counter-controller-config</artifactId>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/extras/odl-bgpcep-extras-dependencies/pom.xml b/features/extras/odl-bgpcep-extras-dependencies/pom.xml
index 834c22f064427af71d872283184e4c39dad211cd..09f529ce038d04e728ba1c4daa76e75b4b58ed65 100644 (file)
--- a/features/extras/odl-bgpcep-extras-dependencies/pom.xml
+++ b/features/extras/odl-bgpcep-extras-dependencies/pom.xml
@@ -52,20 +52,17 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-buffer</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>odl-mdsal-models</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl4-netty-4</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/features4-pcep/pom.xml b/features/pcep/features4-pcep/pom.xml
index b5130f9f59778a0e68e8cbbd4465aa4f8499b3c4..253b27fec60809b25aa70c2b88af46740dddac9b 100644 (file)
--- a/features/pcep/features4-pcep/pom.xml
+++ b/features/pcep/features4-pcep/pom.xml
@@ -33,84 +33,72 @@
             <artifactId>odl-bgpcep-pcep</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-dependencies</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-impl</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-programming-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-programming-impl</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-topology</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-topology-provider</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-tunnel-provider</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-segment-routing</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-auto-bandwidth</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -129,4 +117,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/odl-bgpcep-pcep-api/pom.xml b/features/pcep/odl-bgpcep-pcep-api/pom.xml
index ca8715b58c39827d2f833af334674fc6fb4c58da..50c1cef70df962a51f9dc53026191694d1a98a41 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-api/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-api/pom.xml
@@ -39,6 +39,13 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.6.0-SNAPSHOT</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -60,28 +67,30 @@
             <artifactId>odl-bgpcep-pcep-dependencies</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-netty-config-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-netty</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-controller-config</artifactId>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
     </dependencies>
 
@@ -100,4 +109,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml b/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml
index ad75e4ec6a70b837d006553b1a7512a126e7f798..1d646328ccd7f67ec3ab70c15dc3ec2480b83795 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml
@@ -40,7 +40,6 @@
             <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
     <!--
@@ -58,4 +57,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml b/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml
index 938bdc3b2a22a5ff0c8e16c390e64839587db14a..120a8a770c51416fd3f543c6c3eaa2f66f722d68 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml
@@ -65,14 +65,12 @@
             <artifactId>odl-mdsal-models</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-netty-4</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -91,4 +89,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/odl-bgpcep-pcep-impl/pom.xml b/features/pcep/odl-bgpcep-pcep-impl/pom.xml
index cf15615ad9517aeb4c0bce2228a56381f741b9f7..1c6060f6bfd57487d47bd37330599ac321c2a912 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-impl/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-impl/pom.xml
@@ -44,14 +44,12 @@
             <artifactId>odl-bgpcep-pcep-dependencies</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -70,4 +68,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml b/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
index 7b3056f236fb0371a70ecdad71091d55c54109ba..7f421588d21ee7e6108e6f315da43f9f04346af5 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
@@ -40,7 +40,6 @@
             <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
     <!--
@@ -58,4 +57,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml b/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml
index 98a8eeb13aa89169156729bfcca100fa4c9a5dd3..172b447db045a2797d6610e1fdbfd304728c4ae9 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml
@@ -40,14 +40,12 @@
             <artifactId>odl-bgpcep-pcep-impl</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-topology</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
     <!--
@@ -65,4 +63,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml b/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml
index 6baa88afafeb4d8c1404edfacb9f5dce5ca81cdb..4faffae72c09836190b575f3a546d47744403a04 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml
@@ -52,28 +52,24 @@
             <artifactId>odl-bgpcep-programming-impl</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-controller-config</artifactId>
             <type>xml</type>
             <classifier>config-provider</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
     <!--
@@ -91,4 +87,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/odl-bgpcep-pcep-topology/pom.xml b/features/pcep/odl-bgpcep-pcep-topology/pom.xml
index 227dffaab73876978e234d9248ffc7ba41980f76..1303f6efae1eaeec585bca54a3cc269d4c04f494 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-topology/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-topology/pom.xml
@@ -48,14 +48,12 @@
             <artifactId>odl-bgpcep-programming-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
     <!--
@@ -73,4 +71,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml b/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml
index 0eefce1ed44685edcb232ea2ac5dbe08fb27b96b..498efcbacbf8b4f26aae031b4b3d2cf01118b3c3 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml
@@ -40,7 +40,6 @@
             <artifactId>odl-bgpcep-pcep-topology-provider</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
     <!--
@@ -58,4 +57,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/odl-bgpcep-pcep/pom.xml b/features/pcep/odl-bgpcep-pcep/pom.xml
index 88970b6df185bf0517451b5d7aee01650a486bd0..9d341e77b7012fc28d2736de6c34a8aa369759f5 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep/pom.xml
@@ -36,77 +36,66 @@
             <artifactId>odl-bgpcep-pcep-dependencies</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-impl</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-programming-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-programming-impl</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-topology</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-stateful07</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-topology-provider</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-tunnel-provider</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-segment-routing</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-pcep-auto-bandwidth</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
     <!--
@@ -124,4 +113,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/odl-bgpcep-programming-api/pom.xml b/features/pcep/odl-bgpcep-programming-api/pom.xml
index 46c2fee0a890704a52cae38a7967bc2ec208d88e..215cca8f738a8de030a54f939ffee6e641979201 100644 (file)
--- a/features/pcep/odl-bgpcep-programming-api/pom.xml
+++ b/features/pcep/odl-bgpcep-programming-api/pom.xml
@@ -39,6 +39,13 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.6.0-SNAPSHOT</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -72,14 +79,18 @@
             <artifactId>odl-bgpcep-pcep-dependencies</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
     </dependencies>
     <!--
@@ -97,4 +108,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/pcep/odl-bgpcep-programming-impl/pom.xml b/features/pcep/odl-bgpcep-programming-impl/pom.xml
index e65ab7ef4fd58cc11dafe0274448017fa8913bbe..9fa2e0bbab3ff5fec93b2da70b954bc1ba5a3200 100644 (file)
--- a/features/pcep/odl-bgpcep-programming-impl/pom.xml
+++ b/features/pcep/odl-bgpcep-programming-impl/pom.xml
@@ -52,21 +52,18 @@
             <artifactId>odl-bgpcep-programming-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>programming-controller-config</artifactId>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
     <!--
@@ -84,4 +81,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml b/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml
index ffee07b75926abc329190c884f496e703787b298..604c7d8ff235e2c7bf50bbe9b2816b6aad23dffd 100644 (file)
--- a/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml
+++ b/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml
@@ -60,24 +60,23 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-buffer</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
+            <artifactId>odl-config-core</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>odl-mdsal-models</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl4-netty-4</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
     </dependencies>
 
@@ -96,4 +95,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>