Fix yang-data-tree-api dependency

We pull in yang-data-tree-api through bgp-rib-spi, which we expect
all extensions to depend on. Relegating it to scope=test does the wrong
thing, breaking build at least in Eclipse.

While we are at it, fix dependencies for all extensions.

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

diff --git a/bgp/extensions/evpn/pom.xml b/bgp/extensions/evpn/pom.xml
index ca3f525e0ed87358ae95b74a1d42264dc0e90cbd..33aab523ea3313f1e921737df4cd607112b29396 100644 (file)
--- a/bgp/extensions/evpn/pom.xml
+++ b/bgp/extensions/evpn/pom.xml
@@ -22,10 +22,6 @@
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
 
-    <properties>
-        <odlparent.dependency.enforce>false</odlparent.dependency.enforce>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/bgp/extensions/flowspec/pom.xml b/bgp/extensions/flowspec/pom.xml
index ab2fb32873660e03fefb8185cfbd2edf641ac283..f401acc10869bd131d8502a71a1344b9f86df4fe 100644 (file)
--- a/bgp/extensions/flowspec/pom.xml
+++ b/bgp/extensions/flowspec/pom.xml
@@ -22,10 +22,6 @@
     <description>BGP Flow Specification</description>
     <name>${project.artifactId}</name>
 
-    <properties>
-        <odlparent.dependency.enforce>false</odlparent.dependency.enforce>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -43,10 +39,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common-netty</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-impl</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.kohsuke.metainf-services</groupId>
             <artifactId>metainf-services</artifactId>
@@ -66,6 +58,11 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-parser-spi</artifactId>

diff --git a/bgp/extensions/l3vpn/pom.xml b/bgp/extensions/l3vpn/pom.xml
index b91bf32cbc9a724100637bd0343e2ac976d84825..bed05051185e118975391ab68e3372b77d69b3d2 100644 (file)
--- a/bgp/extensions/l3vpn/pom.xml
+++ b/bgp/extensions/l3vpn/pom.xml
@@ -22,10 +22,6 @@
     <description>BGP L3 VPN</description>
     <name>${project.artifactId}</name>
 
-    <properties>
-        <odlparent.dependency.enforce>false</odlparent.dependency.enforce>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/bgp/extensions/mvpn/pom.xml b/bgp/extensions/mvpn/pom.xml
index f514f5a202c6687bbb5c6282f55c81e1348cd741..f94c0656b41bce6fbba3be73acc280c7a8db876a 100644 (file)
--- a/bgp/extensions/mvpn/pom.xml
+++ b/bgp/extensions/mvpn/pom.xml
@@ -70,19 +70,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <configuration>
-                    <ignoredUnusedDeclaredDependencies combine.children="append">
-                        <ignoredUnusedDeclaredDependency>org.opendaylight.mdsal.model:yang-ext</ignoredUnusedDeclaredDependency>
-                    </ignoredUnusedDeclaredDependencies>
-                </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/bgp/extensions/parent/pom.xml b/bgp/extensions/parent/pom.xml
index 47eb4db9f07731c8d6591c23ec8c37a824b7ce34..3fd32641018834c44d8c731bc6701ad00d45df68 100644 (file)
--- a/bgp/extensions/parent/pom.xml
+++ b/bgp/extensions/parent/pom.xml
@@ -73,16 +73,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-tree-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-tree-spi</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-codec-api</artifactId>
@@ -103,6 +93,7 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+
         <!-- test scope dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -110,6 +101,11 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-tree-spi</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-test-utils</artifactId>
@@ -133,7 +129,16 @@
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <configuration>
+                    <ignoredUsedUndeclaredDependencies>
+                        <ignoredUsedUndeclaredDependency>org.opendaylight.yangtools:yang-data-tree-api</ignoredUsedUndeclaredDependency>
+                    </ignoredUsedUndeclaredDependencies>
+                    <ignoredNonTestScopedDependencies>
+                        <ignoredNonTestScopedDependencies>org.opendaylight.yangtools:yang-data-tree-api</ignoredNonTestScopedDependencies>
+                        <ignoredNonTestScopedDependencies>org.opendaylight.yangtools:yang-data-impl</ignoredNonTestScopedDependencies>
+                        <ignoredNonTestScopedDependencies>org.opendaylight.bgpcep:concepts</ignoredNonTestScopedDependencies>
+                    </ignoredNonTestScopedDependencies>
                     <ignoredUnusedDeclaredDependencies>
+                        <ignoredUnusedDeclaredDependency>org.opendaylight.mdsal.model:yang-ext</ignoredUnusedDeclaredDependency>
                         <ignoredUnusedDeclaredDependency>org.opendaylight.bgpcep:bgp-bmp-api</ignoredUnusedDeclaredDependency>
                     </ignoredUnusedDeclaredDependencies>
                 </configuration>

diff --git a/bgp/extensions/route-target/pom.xml b/bgp/extensions/route-target/pom.xml
index 08a119ebae1509c139078a0cbc5cdcb7ae6a28d7..28a71df4a44cf040288c61aef7dfb484f61ec4d0 100644 (file)
--- a/bgp/extensions/route-target/pom.xml
+++ b/bgp/extensions/route-target/pom.xml
@@ -109,19 +109,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <configuration>
-                    <ignoredUnusedDeclaredDependencies combine.children="append">
-                        <ignoredUnusedDeclaredDependency>org.opendaylight.mdsal.model:yang-ext</ignoredUnusedDeclaredDependency>
-                    </ignoredUnusedDeclaredDependencies>
-                </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>