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>

diff --git a/bgp/cli/pom.xml b/bgp/cli/pom.xml
index 3f05a0573336a2da86f4ffb958efae8d15d12fa0..e7b6c51df354e2f611d19a4944d7e37b3e2ec09b 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 10e4f32f4f86c1b945786a28ad5243780bbabf8b..9c74d0e5a3be872bf1a2cc7694e7df51857c922e 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 8b6758662620632aee1fb3d47d53991155d3d733..8f6c2d0169ed72d1e7cbd6c0c8faece311983ca1 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 a2f00857daaa2752cf4509011f49d7a823bfe677..a5900b2456dbbb404e37563dca2d0a69f5368349 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 f25d1724943d89a91ff06d5273922eeaa1f37d17..cf8d7275bb16eabb6c5f9fe3879e313904ba2f1d 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 d5ca75332dc467a9a83635106ea1dd98671d5833..af1fa8e0b95491223a08751df01fe423d458469e 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 c4ecc3d32e98eda47cd7846ea3eeac3362589608..c12667bc61acc3d85e3db888ec2766b0cee9c5f8 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 c87b194e158821b69faa32eadcb151eb044a0960..d1dce58654b0b69da7dbf175e4c4bbfcea9e906f 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 7bf7ad7236429c87db3acc49bd29933841f0675b..99c44b37cd1bc75cfc86de8814a977569c10d7ab 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 9421cdaa89cfe450ca7607c93aaeb805f08ee91a..edb0394aa3569ea30981886b5471b71f195d53af 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 3278ac575083d78c2fe5a095bb3576528da6bdf2..3bd539dbc128821688200953fb3af2fe095687ce 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 e759866506f097f344835987074836f0cb6909ac..0b2b72a6112e4ce09e111135a2f287d2ab15a5db 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 ef10023b3026d596ab998c69f0c5d2b96e3e9a63..630af60b1c12dfe8e7fbe02890a0f2bf70924cda 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 47f4091f725fadb1d0b0f43740e4bc4f38acdd0b..bbdd651d7335e4edf39411f3ada770d703c1cafa 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 686e9f09e80dc7d38e1ea71a23f25be3f1056719..2566bae9f6320a07c4c85bd1e6d0bd5d593da9ca 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 b629eaba31ad2116a74457a1690085a407f563e1..55f0eb13dd85f62b985b551a4c705c870fc31f8f 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 04ba3e7cca9b43c1dca7de988f86513e98940767..7c459b774ad6cee2f28e8e592fd13e8c8517d616 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 501ad34feee5ac1725a74d93875cdf8a17f0b706..01b43de11d140709965f19299dc9ad3f78e200af 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 227aea29457d0ed65808c0ae777039d9fe691428..58c38fe5111496e1d9f21e4271423995cbd4471e 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 a1eae7c13279f0d70f4a648905dc2b5c077b7df5..fbfec43601d784b87a42319235b748a8c0482564 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 e53a0bfb1c77bbbb1cb747f63a601f4333515392..06a15e8db92ac6bba3b97dea3e0cc2824b35adf8 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 30446e9a1c9a4e86eebebf17bc6803f329599c77..54ee22239a35215866658d6c59f340cd1659ee36 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 974fc48d0204eee525095cba87a517c4c9b228d5..8faf5636b9e62404369272c8ac72f41ae13214b2 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 31e012d512e726b4561496dbeb99ac2d63c9d156..679825a0ac9bd376df05fa08af5c897880eba6d0 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 ef0847605e94cff429380a23b0633695ad5b3589..9cf79fc1207ff99c8e051eea0fb4f3ebc8a2f95d 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 d35f36a3d4798e1dbd32cfe4fff0c6c601d8ec4c..4e25e59b70f94d6cac4455ee4fbfa6a30f7d8c26 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 92321906555e2b150b8728361a615e1af71f0c11..40f731fec627cd54a3291b99b7cc306bacb9d801 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 c726dce25636aecfbd3e7bcb27bd78bb41bfdeba..912924bf900a92c7956cd631ee3c0013c8469ecd 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.5.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 005a7b1da0c526af3adb75c1082cc17f578e8618..81b94084c7cc616c6124f4c6217030562d814065 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 6e8257977b70a35d2be90f3075a2d313434bd66e..fddbdb7d4e559c44514c64f50d67d16ce330fae6 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 a114ddc80281fea0f7b02d9c4555900ea5d6c5ea..0746a9411be96d715dc621d0ad8b55f5eb25df80 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 6d26f70964142186e671f757ad9cb6d55b3319e4..6ed726ebc966e09b613bee6e47b41a38fb08f7e2 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 601b41640ae40126949d97af524e4f56fa4410c7..32705cf3c16a0e4f2e4e404adfe2652afc93a9f1 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 4cf0dfc8900edaca57a611c2c302a1a0e7791f72..38a06f5afec49c489f126156a22574b26db10f1f 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 347012deaff457a72d0c1125898e37bce13bf237..f6bb07ead8234a6bb6167368875068e4bff2ef9b 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 a6e72a8af8e80e371bece54c79ec81a6dfc06b41..5f4bd3e4e4da8de0879f0144e58d1bf7d566ae0c 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 3e279d49c75e0bb4df805b5f6844e471d5cf9ee0..0b1ef2400b7e587a99105d1618b9e76a8c144772 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 5da1202b079dac5aebcbd8ff4590d38bc1e04bf7..3a5f6c9b323f01f98417b5d153688011adf39192 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.5.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 ca75f4eea024202ba2ddaf3118d82210c2f4612b..68432bf06655deb61c2c3d10cb5c3ffb26ed2d22 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 bf5bce0cb78c6db1230d518a897716b0dd849e11..30421cd39c0cf60504bc617eb63ded6c5c946b4a 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>