Unify version management: PCEP and its dependencies

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

diff --git a/pcep/api-config/pom.xml b/pcep/api-config/pom.xml
index 3d9c04b138ae92ef62bc60514c8c3be8cffdd904..1a836f82113e223af63ecee093b5e85c20900f74 100644 (file)
--- a/pcep/api-config/pom.xml
+++ b/pcep/api-config/pom.xml
@@ -18,12 +18,10 @@
       <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>config-api</artifactId>
-         <version>${controller.config.version}</version>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>pcep-api</artifactId>
-         <version>${project.version}</version>
       </dependency>
    </dependencies>
 
@@ -88,4 +86,4 @@
          <url>${basedir}/target/site/${project.artifactId}</url>
       </site>
    </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/pcep/api/pom.xml b/pcep/api/pom.xml
index 692426b306ccc88bbd188ae1728e66c031a8f466..7d5ddd1981b5924d7892ce7fa82998f9cd710688 100644 (file)
--- a/pcep/api/pom.xml
+++ b/pcep/api/pom.xml
@@ -21,45 +21,32 @@
        <dependencies>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>framework</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>concepts</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>concepts</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>framework</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>rsvp-api</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>util</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>util</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>rsvp-api</artifactId>
                </dependency>
         <dependency>
                        <groupId>io.netty</groupId>
                        <artifactId>netty-transport</artifactId>
-            <version>${netty.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
-                       <version>${guava.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
-                       <version>${slf4j.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>mockito-configuration</artifactId>
-            <version>${project.version}</version>
-                       <scope>test</scope>
-        </dependency>
 
         <!--
             FIXME: this is in support of the generated code. This should not
@@ -68,12 +55,10 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yang.binding.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
-            <version>${yangtools.version}</version>
         </dependency>
 
         <!--
@@ -86,9 +71,15 @@
             <artifactId>ietf-inet-types</artifactId>
             <version>${ietf.types.version}</version>
         </dependency>
+
+        <!-- Testing dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+        </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>mockito-configuration</artifactId>
         </dependency>
        </dependencies>
 

diff --git a/pcep/impl-config/pom.xml b/pcep/impl-config/pom.xml
index 6094e5b11dc081ce9dd99e9808b4bfe2ddb42a5f..c34ccd1c8f0fe0638a816fe196866f54ce12e771 100644 (file)
--- a/pcep/impl-config/pom.xml
+++ b/pcep/impl-config/pom.xml
@@ -15,29 +15,21 @@
    </prerequisites>
 
    <dependencies>
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-      </dependency>
       <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>config-api</artifactId>
-         <version>${controller.config.version}</version>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>pcep-impl</artifactId>
-         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>pcep-api-config</artifactId>
-         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>pcep-spi-config</artifactId>
-         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.opendaylight.controller</groupId>
@@ -46,6 +38,10 @@
       </dependency>
 
       <!--test dependencies -->
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+      </dependency>
       <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>config-manager</artifactId>

diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml
index 638380c9cc6f9c28fccbe9860420059fe8c1f809..deb3efd5751c680fd26dc31cddeab88000d238ba 100644 (file)
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -22,80 +22,63 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>pcep-api</artifactId>
-                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>pcep-spi</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
+        </dependency>
+
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>framework</artifactId>
-                       <version>${project.version}</version>
+                       <artifactId>concepts</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>util</artifactId>
-                       <version>${project.version}</version>
+                       <artifactId>framework</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>concepts</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
+                       <artifactId>util</artifactId>
+        </dependency>
+
         <dependency>
                        <groupId>io.netty</groupId>
                        <artifactId>netty-codec</artifactId>
-            <version>${netty.version}</version>
                </dependency>
         <dependency>
                        <groupId>io.netty</groupId>
                        <artifactId>netty-common</artifactId>
-            <version>${netty.version}</version>
                </dependency>
         <dependency>
                        <groupId>io.netty</groupId>
                        <artifactId>netty-transport</artifactId>
-            <version>${netty.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
-                       <version>${guava.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.google.code.findbugs</groupId>
                        <artifactId>jsr305</artifactId>
-                       <version>2.0.1</version>
                </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
-                       <version>${slf4j.version}</version>
                </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
             <version>2010.09.24-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>${osgi.version}</version>
-            <scope>provided</scope>
-        </dependency>
+
+        <!-- Test dependencies -->
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
-                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>mockito-configuration</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>

diff --git a/pcep/pom.xml b/pcep/pom.xml
index bccc63f913c4a22e6caa22ce5eae8c3f8b17576b..92b147575dd4e354f05c4b7b08e865edd6327b9a 100644 (file)
--- a/pcep/pom.xml
+++ b/pcep/pom.xml
@@ -32,4 +32,127 @@
         <module>tunnel-provider</module>
         <module>tunnel-provider-config</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-api-config</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-impl-config</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-spi-config</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-topology-provider-config</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>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>pcep-tunnel-provider-config</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-spi-config</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-api-config</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/pcep/spi-config/pom.xml b/pcep/spi-config/pom.xml
index bf7d9d6c45ce2799b2c130d3eb1ec26ebf0c9199..7c7a965a44a98b35a10be4714e4cb12366b44180 100644 (file)
--- a/pcep/spi-config/pom.xml
+++ b/pcep/spi-config/pom.xml
@@ -18,12 +18,10 @@
       <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>config-api</artifactId>
-         <version>${controller.config.version}</version>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>pcep-spi</artifactId>
-         <version>${project.version}</version>
       </dependency>
    </dependencies>
 

diff --git a/pcep/spi/pom.xml b/pcep/spi/pom.xml
index 9492692d90c801b0e42ba0a9d7cd79fe1b9eaf81..9717adad0003dbacd2aeaa92a219e8b2e49a7c47 100644 (file)
--- a/pcep/spi/pom.xml
+++ b/pcep/spi/pom.xml
@@ -21,31 +21,32 @@
        <dependencies>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>concepts</artifactId>
-            <version>${project.version}</version>
-               </dependency>
+                       <artifactId>pcep-api</artifactId>
+        </dependency>
+
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-api</artifactId>
-            <version>${project.version}</version>
-               </dependency>
+                       <artifactId>concepts</artifactId>
+        </dependency>
+
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
-                       <version>${slf4j.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>mockito-configuration</artifactId>
-            <version>${project.version}</version>
-                       <scope>test</scope>
         </dependency>
+
+        <!-- FIXME: move into pcep-spi-osgi -->
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <version>${osgi.version}</version>
             <scope>provided</scope>
         </dependency>
+
+        <!-- Testing dependencies -->
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>mockito-configuration</artifactId>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/pcep/testtool/pom.xml b/pcep/testtool/pom.xml
index a3c6ffdbdc777703b79166e6a86545a7ffb41c53..661cc1ad755808e0614a0c9e582b9586d6149f5e 100644 (file)
--- a/pcep/testtool/pom.xml
+++ b/pcep/testtool/pom.xml
@@ -21,50 +21,46 @@
        <dependencies>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>concepts</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>pcep-api</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>framework</artifactId>
-            <version>${project.version}</version>
-               </dependency>
+                       <artifactId>pcep-impl</artifactId>
+        </dependency>
+
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-api</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>concepts</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-impl</artifactId>
-            <version>${project.version}</version>
-               </dependency>
+                       <artifactId>framework</artifactId>
+        </dependency>
+
         <dependency>
                        <groupId>io.netty</groupId>
                        <artifactId>netty-common</artifactId>
-            <version>${netty.version}</version>
                </dependency>
         <dependency>
                        <groupId>io.netty</groupId>
                        <artifactId>netty-transport</artifactId>
-            <version>${netty.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
-                       <version>${guava.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
-                       <version>${slf4j.version}</version>
                </dependency>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-classic</artifactId>
                        <version>${logback.version}</version>
                        <scope>runtime</scope>
-               </dependency>
+        </dependency>
+
+        <!-- Testing dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/pcep/topology-api/pom.xml b/pcep/topology-api/pom.xml
index c1c3d986bf913085e13c9157b9d09f1356a06aeb..312a0b4dbad3d687252d2739cebc01b37106ab51 100644 (file)
--- a/pcep/topology-api/pom.xml
+++ b/pcep/topology-api/pom.xml
@@ -22,27 +22,22 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>pcep-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>programming-topology-api</artifactId>
-            <version>${project.version}</version>
                </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yang.binding.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
-            <version>${yangtools.version}</version>
         </dependency>
        </dependencies>
 

diff --git a/pcep/topology-provider-config/pom.xml b/pcep/topology-provider-config/pom.xml
index d09905ff3533fb1d8e28ec4870bf8159c27c372c..4f6a0ec8a913c38ef8e5f0c3f802b16c0d7624ea 100644 (file)
--- a/pcep/topology-provider-config/pom.xml
+++ b/pcep/topology-provider-config/pom.xml
@@ -18,32 +18,26 @@
       <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>config-api</artifactId>
-         <version>${controller.config.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-api-config</artifactId>
-         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
-         <artifactId>topology-api</artifactId>
-         <version>${project.version}</version>
+         <artifactId>programming-spi-config</artifactId>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
-         <artifactId>topology-api-config</artifactId>
-         <version>${project.version}</version>
+         <artifactId>topology-api</artifactId>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
-         <artifactId>programming-spi-config</artifactId>
-         <version>${project.version}</version>
+         <artifactId>topology-api-config</artifactId>
       </dependency>
       <dependency>
          <groupId>org.opendaylight.controller</groupId>

diff --git a/pcep/topology-provider/pom.xml b/pcep/topology-provider/pom.xml
index c0efedd1b9207a103495b8bc4378e51c7a6f9c51..a6a066dab09f88f64600aac6e87c021570025f7a 100644 (file)
--- a/pcep/topology-provider/pom.xml
+++ b/pcep/topology-provider/pom.xml
@@ -22,32 +22,26 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>pcep-api</artifactId>
-            <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>topology-api</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>pcep-topology-api</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>programming-api</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>pcep-topology-spi</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>programming-spi</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>programming-api</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-topology-api</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>programming-spi</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-topology-spi</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>topology-api</artifactId>
                </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -57,26 +51,13 @@
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
-                       <version>${slf4j.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>mockito-configuration</artifactId>
-            <version>${project.version}</version>
-                       <scope>test</scope>
         </dependency>
 
-        <!-- FIXME: integrate with config to get rid of this -->
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-impl</artifactId>
-            <version>${project.version}</version>
-               </dependency>
+        <!-- Test dependencies -->
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-spi</artifactId>
-            <version>${project.version}</version>
-               </dependency>
+                       <artifactId>mockito-configuration</artifactId>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/pcep/topology-spi/pom.xml b/pcep/topology-spi/pom.xml
index f0975838ffe511a5f44f4f23ad07dd01383f2154..de92f1cfb35b1395c96a56de5df47d6d4f5257f6 100644 (file)
--- a/pcep/topology-spi/pom.xml
+++ b/pcep/topology-spi/pom.xml
@@ -22,51 +22,33 @@
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>pcep-api</artifactId>
-            <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>topology-api</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>pcep-topology-api</artifactId>
                </dependency>
                <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>pcep-topology-api</artifactId>
-            <version>${project.version}</version>
-               </dependency>
+                       <artifactId>topology-api</artifactId>
+        </dependency>
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
-                       <version>${slf4j.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>mockito-configuration</artifactId>
-            <version>${project.version}</version>
-                       <scope>test</scope>
         </dependency>
 
-        <!-- FIXME: integrate with config to get rid of this -->
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-impl</artifactId>
-            <version>${project.version}</version>
-               </dependency>
+        <!-- Testing dependencies -->
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-spi</artifactId>
-            <version>${project.version}</version>
-               </dependency>
+                       <artifactId>mockito-configuration</artifactId>
+        </dependency>
        </dependencies>
 
        <build>

diff --git a/pcep/tunnel-api/pom.xml b/pcep/tunnel-api/pom.xml
index 69e72e7bde7a33395b462ef961d9eeb5cd1ded20..e8c62123d0471a06181dc89c513c1c3c5674c747 100644 (file)
--- a/pcep/tunnel-api/pom.xml
+++ b/pcep/tunnel-api/pom.xml
@@ -19,40 +19,33 @@
        </prerequisites>
 
        <dependencies>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>pcep-api</artifactId>
+               </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>programming-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>topology-api</artifactId>
-            <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>topology-tunnel-api</artifactId>
-            <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-api</artifactId>
-            <version>${project.version}</version>
                </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yang.binding.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
-            <version>${yangtools.version}</version>
         </dependency>
        </dependencies>
 

diff --git a/pcep/tunnel-provider-config/pom.xml b/pcep/tunnel-provider-config/pom.xml
index 3c91affd864eef1613a37793ab1fe7e8225215c0..516c42785201b7a0ab1c0dd8d438cba3157c99eb 100644 (file)
--- a/pcep/tunnel-provider-config/pom.xml
+++ b/pcep/tunnel-provider-config/pom.xml
@@ -18,37 +18,30 @@
       <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>config-api</artifactId>
-         <version>${controller.config.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>${project.groupId}</groupId>
+         <artifactId>pcep-api-config</artifactId>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>pcep-tunnel-provider</artifactId>
-         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
-         <artifactId>pcep-api-config</artifactId>
-         <version>${project.version}</version>
+         <artifactId>pcep-topology-provider-config</artifactId>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>topology-api</artifactId>
-         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>topology-api-config</artifactId>
-         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>programming-spi-config</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-      <dependency>
-         <groupId>${project.groupId}</groupId>
-         <artifactId>pcep-topology-provider-config</artifactId>
-         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.opendaylight.controller</groupId>

diff --git a/pcep/tunnel-provider/pom.xml b/pcep/tunnel-provider/pom.xml
index 9a8366d76bc6643084a61443f8c66e94a5b27571..081bc79b96996ec7bf0f18d5806b87af2f9b2aa7 100644 (file)
--- a/pcep/tunnel-provider/pom.xml
+++ b/pcep/tunnel-provider/pom.xml
@@ -21,33 +21,27 @@
        <dependencies>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>programming-spi</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>pcep-topology-api</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>topology-api</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>pcep-topology-spi</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>topology-tunnel-api</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>pcep-tunnel-api</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-topology-api</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>programming-spi</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-topology-spi</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>topology-api</artifactId>
                </dependency>
                <dependency>
                        <groupId>${project.groupId}</groupId>
-                       <artifactId>pcep-tunnel-api</artifactId>
-            <version>${project.version}</version>
+                       <artifactId>topology-tunnel-api</artifactId>
                </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -57,13 +51,12 @@
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
-                       <version>${slf4j.version}</version>
-               </dependency>
+        </dependency>
+
+        <!-- Testing dependencies -->
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>mockito-configuration</artifactId>
-            <version>${project.version}</version>
-                       <scope>test</scope>
         </dependency>
        </dependencies>