Remove unneeded dependencyManagement sections

All these are inherited from the artifacts artifact, so should no longer
be needed.

Change-Id: I9154403b2d69df0e47f146738c8d3da1ae3f8ff1
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 85de7005fe440170d4ccbb9c9b1f704eab3e8e20..11aa75ddd07db1e64b837ffc58c18fa732560d96 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -172,6 +172,11 @@
                 <artifactId>pcep-pcc-mock</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>pcep-testtool</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>pcep-segment-routing</artifactId>

diff --git a/bgp/pom.xml b/bgp/pom.xml
index 7d9b8adab76d3ad791e8405b11c998c26587cf0c..a6bb49b71cf047e08a5912e779e1374811040cbe 100644 (file)
--- a/bgp/pom.xml
+++ b/bgp/pom.xml
@@ -10,7 +10,6 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-
     <modelVersion>4.0.0</modelVersion>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/bgpcep.git</connection>
@@ -24,9 +23,6 @@
         <version>0.4.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
 
     <artifactId>bgp-parent</artifactId>
     <description>BGP-related components</description>
@@ -53,87 +49,4 @@
         <module>feature</module>
 
     </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-concepts</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-linkstate</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-parser-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-parser-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-parser-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-parser-mock</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-rib-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-rib-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-rib-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-testtool</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-rib-mock</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-topology-provider</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bgp-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <!-- Outside of this component -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>rsvp-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>topology-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
 </project>

diff --git a/pcep/pom.xml b/pcep/pom.xml
index 7c2891603cc6f2c3e9bed36f4280aae71f70615a..32d16d483555c9c22eda8fb69c519eb33a2b6dc7 100644 (file)
--- a/pcep/pom.xml
+++ b/pcep/pom.xml
@@ -10,7 +10,6 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-
     <modelVersion>4.0.0</modelVersion>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/bgpcep.git</connection>
@@ -24,9 +23,6 @@
         <version>0.4.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
 
     <artifactId>pcep-parent</artifactId>
     <description>PCEP protocol parent</description>
@@ -50,101 +46,4 @@
         <module>segment-routing</module>
         <module>pcc-mock</module>
     </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-ietf-stateful02</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-ietf-stateful07</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-testtool</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-topology-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-topology-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-topology-provider</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-tunnel-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-tunnel-provider</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <!-- Stuff outside of this component -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>programming-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>programming-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>programming-topology-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>programming-tunnel-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>rsvp-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>topology-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>topology-tunnel-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>

diff --git a/programming/pom.xml b/programming/pom.xml
index 62b91874883ac810fe2a66cdd42100eb0151b13e..195aa0fee036446ed6bd0fb55f77890bd7ae8ffc 100644 (file)
--- a/programming/pom.xml
+++ b/programming/pom.xml
@@ -24,9 +24,6 @@
         <version>0.4.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
 
     <artifactId>programming-parent</artifactId>
     <description>Programming parent</description>
@@ -42,47 +39,4 @@
 
         <module>controller-config</module>
     </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>programming-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>programming-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>programming-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>programming-topology-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>programming-tunnel-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <!-- Stuff outside of this component -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>topology-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>topology-tunnel-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
 </project>

diff --git a/rsvp/pom.xml b/rsvp/pom.xml
index ab3b6e9c35201c64af7fc6d4f913651b8adbd6d9..1763fcc435e24406df0f787ee5df86a8c46d98a8 100644 (file)
--- a/rsvp/pom.xml
+++ b/rsvp/pom.xml
@@ -24,9 +24,6 @@
         <version>0.4.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
 
     <artifactId>rsvp-parent</artifactId>
     <description>RSVP-related components</description>
@@ -36,14 +33,4 @@
     <modules>
         <module>api</module>
     </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>rsvp-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>

diff --git a/topology/pom.xml b/topology/pom.xml
index 58ebd34e747b9b9662ff3d6ddc4fea04ac3cd1c7..b19434daa973c75ab97fbe59131967e13be28e64 100644 (file)
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -10,7 +10,6 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-
     <modelVersion>4.0.0</modelVersion>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/bgpcep.git</connection>
@@ -29,33 +28,10 @@
     <description>Topology parent</description>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
 
     <modules>
         <module>api</module>
         <module>segment-routing</module>
         <module>tunnel-api</module>
     </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>topology-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>topology-segment-routing</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>topology-tunnel-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>