Start openflowplugin-artifacts

Inter-project dependencies are better tracked through a single artifact.
All our upstream projects already define one, so let's follow their
lead.

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

diff --git a/applications/features/pom.xml b/applications/features/pom.xml
index 2ab1e0a7d511e14e8f1e80f13604af57fb0cd53e..8369d9055ad19797e41f769addf0cfc5c3f862ad 100644 (file)
--- a/applications/features/pom.xml
+++ b/applications/features/pom.xml
@@ -24,28 +24,24 @@
       <type>xml</type>
     </dependency>
 
-  <dependency>
+    <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>statistics-manager-config</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
-  </dependency>
+    </dependency>
 
     <dependency>
       <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-base</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-service</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-statistics</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
@@ -60,27 +56,22 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>topology-manager</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>topology-lldp-discovery</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>statistics-manager</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>inventory-manager</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>forwardingrules-manager</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <!-- test to validate features.xml -->
     <dependency>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
new file mode 100644 (file)
index 0000000..3b0a854
--- /dev/null
+++ b/artifacts/pom.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+    Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v1.0 which accompanies this distribution,
+    and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<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>
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>openflowplugin-artifacts</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <!-- to be deprecated -->
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowplugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowplugin-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowplugin-extension-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowplugin-extension-nicira</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowjava-extension-nicira</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowjava-extension-nicira-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.model</groupId>
+                <artifactId>model-flow-base</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.model</groupId>
+                <artifactId>model-flow-service</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.model</groupId>
+                <artifactId>model-flow-statistics</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>forwardingrules-manager</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>inventory-manager</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>lldp-speaker</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>statistics-manager</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>table-miss-enforcer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>topology-lldp-discovery</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>topology-manager</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>of-switch-config-pusher</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>drop-test-karaf</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.legacy</groupId>
+                <artifactId>sal-compatibility</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>test-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>of-switch-config-pusher</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>statistics-manager-config</artifactId>
+                <version>${project.version}</version>
+                <classifier>config</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>table-miss-enforcer</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>lldp-speaker</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowplugin-controller-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowplugin-controller-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>configmsgspy</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowplugin-extension-nicira-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>config</classifier>
+            </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-openflowplugin</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-openflowplugin-extension</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
+

diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index f107a12b42b74d2c06aa2f6a5f7bd8b57250bad7..4dc58411f72154f5387153e38dbd86ad61eca6a3 100644 (file)
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -57,7 +57,6 @@
     <dependency>
       <artifactId>features-openflowplugin</artifactId>
       <groupId>org.opendaylight.openflowplugin</groupId>
-      <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
@@ -75,7 +74,6 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>features-openflowplugin-extension</artifactId>
-      <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>

diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml
index 89288fbaa560dea3c4057bd75b97916a09d53158..b8ac62e4387e64870c6fcfd6c0fdaab54e76eefe 100644 (file)
--- a/drop-test-karaf/pom.xml
+++ b/drop-test-karaf/pom.xml
@@ -17,7 +17,6 @@
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>test-common</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/drop-test/pom.xml b/drop-test/pom.xml
index 55f449f232e37cf5ad56b7982a8716b4d575c654..88ee816322bacc3dded2f632494944a2ace5f9b3 100644 (file)
--- a/drop-test/pom.xml
+++ b/drop-test/pom.xml
@@ -16,7 +16,6 @@
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>test-common</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -30,19 +29,19 @@
             <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
         </dependency>    
-           <dependency>
-             <groupId>org.opendaylight.openflowplugin.model</groupId>
-             <artifactId>model-flow-base</artifactId>
-           </dependency>
+            <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-base</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
         </dependency>
         <dependency>
-               <groupId>equinoxSDK381</groupId>
-               <artifactId>org.eclipse.osgi</artifactId>
-           </dependency>
-           <dependency>
+            <groupId>equinoxSDK381</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+        </dependency>
+        <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>

diff --git a/extension/features/pom.xml b/extension/features/pom.xml
index f941532adcfed3d23cbd9aaf382d2a1586e760cd..0134d30774384d224221d6548640500bb0de71c4 100644 (file)
--- a/extension/features/pom.xml
+++ b/extension/features/pom.xml
@@ -21,7 +21,6 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>features-openflowplugin</artifactId>
-      <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -30,31 +29,26 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-extension-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <!-- Nicira extensions -->
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-extension-nicira-config</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-extension-nicira</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowjava-extension-nicira-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowjava-extension-nicira</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <!-- test the features.xml -->

diff --git a/extension/openflowplugin-extension-nicira/pom.xml b/extension/openflowplugin-extension-nicira/pom.xml
index 13dc7c064b3b441cd29bc37e4f22ec33fec0cfe5..cf7571edf7e6fa8c3462a12b8d86ec5a8e2337b2 100644 (file)
--- a/extension/openflowplugin-extension-nicira/pom.xml
+++ b/extension/openflowplugin-extension-nicira/pom.xml
@@ -76,7 +76,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>openflowplugin-extension-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -90,7 +89,6 @@
             <!-- configSubsystem yang should be moved to API and this would be doomed for removal -->
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <!-- MD-SAL models -->

diff --git a/extension/pom.xml b/extension/pom.xml
index a7efcf4097fcbdfa843871c15deb48d00db06f41..f4cbb6be03bc06266671e6ef4f5ac3849e373bd8 100644 (file)
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -21,19 +21,4 @@
         <module>features</module>
         <module>test-extension</module>
     </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflowjava-extension-nicira</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflowjava-extension-nicira-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>

diff --git a/extension/test-extension/pom.xml b/extension/test-extension/pom.xml
index 08dc703c9f849adca2d24bf4592cf5e266886506..60c1bcb839bfce0dd280f90452ef1eb4e35f66cc 100644 (file)
--- a/extension/test-extension/pom.xml
+++ b/extension/test-extension/pom.xml
@@ -76,23 +76,19 @@
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-extension-nicira</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-extension-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowjava-extension-nicira</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <!-- configSubsystem yang should be moved to API and this would be doomed for removal -->
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <!-- MD-SAL models -->

diff --git a/features/pom.xml b/features/pom.xml
index c79cc89161920a6bd1611d513d0ba3b11dae4634..2d44e31e44a4db6af88f648dc347bae9af100cb6 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -75,27 +75,22 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>forwardingrules-manager</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>inventory-manager</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>lldp-speaker</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>statistics-manager</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>statistics-manager-config</artifactId>
-      <version>${project.version}</version>
       <classifier>config</classifier>
       <type>xml</type>
     </dependency>
@@ -120,27 +115,22 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-extension-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>table-miss-enforcer</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>table-miss-enforcer</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
@@ -148,31 +138,26 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>topology-lldp-discovery</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>topology-manager</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
-      <dependency>
-          <groupId>org.opendaylight.openflowplugin.applications</groupId>
-          <artifactId>of-switch-config-pusher</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.openflowplugin.applications</groupId>
-          <artifactId>of-switch-config-pusher</artifactId>
-          <version>${project.version}</version>
-          <type>xml</type>
-          <classifier>config</classifier>
-      </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>of-switch-config-pusher</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>of-switch-config-pusher</artifactId>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
 
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>lldp-speaker</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
@@ -180,24 +165,20 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>drop-test-karaf</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>test-common</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-controller-config</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-controller-config</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>configmsgspy</classifier>
     </dependency>

diff --git a/legacy/features-legacy/pom.xml b/legacy/features-legacy/pom.xml
index 1ba0eafcfc48da2f47b52cbc919aabb9320bc4db..4c7bae065afdce3b81654fbeed9e34b04beeff19 100644 (file)
--- a/legacy/features-legacy/pom.xml
+++ b/legacy/features-legacy/pom.xml
@@ -73,7 +73,6 @@
       <dependency>\r
         <groupId>org.opendaylight.openflowplugin</groupId>\r
         <artifactId>features-openflowplugin</artifactId>\r
-        <version>${project.version}</version>\r
         <classifier>features</classifier>\r
         <type>xml</type>\r
       </dependency>\r
@@ -98,7 +97,6 @@
       <dependency>\r
         <groupId>org.opendaylight.openflowplugin.legacy</groupId>\r
         <artifactId>sal-compatibility</artifactId>\r
-        <version>${project.version}</version>\r
       </dependency>\r
 \r
     <!--\r

diff --git a/model/model-flow-service/pom.xml b/model/model-flow-service/pom.xml
index 819d16dda1ef66797c3b5214239b6a13d3056460..98f353e5dc352963dab5f4b2502c0f03126b93f1 100644 (file)
--- a/model/model-flow-service/pom.xml
+++ b/model/model-flow-service/pom.xml
@@ -15,7 +15,6 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>model-flow-base</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>

diff --git a/model/model-flow-statistics/pom.xml b/model/model-flow-statistics/pom.xml
index d9e15fee1c75d3d94769b7c9f491a099af73ac6e..437956be580bbdbceeee6e42009c1e408872c657 100644 (file)
--- a/model/model-flow-statistics/pom.xml
+++ b/model/model-flow-statistics/pom.xml
@@ -15,12 +15,10 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>model-flow-base</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>model-flow-service</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>

diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index efde56c993d0a4f9e8608ea043b009e7b365f82a..234f1ce8d04af2a5a2a3398a4f691e56a35f83fc 100644 (file)
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -71,20 +71,12 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowplugin-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <!-- to be deprecated -->
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-extension-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.model</groupId>

diff --git a/openflowplugin-it/pom.xml b/openflowplugin-it/pom.xml
index f1aba0f667b257337a66d6cdca3e26dffaa7d047..1e2e727377f7086777569b703bf6788b69171039 100644 (file)
--- a/openflowplugin-it/pom.xml
+++ b/openflowplugin-it/pom.xml
@@ -84,19 +84,16 @@
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-api</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-extension-api</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -252,13 +249,11 @@
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>forwardingrules-manager</artifactId>
             <scope>test</scope>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>inventory-manager</artifactId>
             <scope>test</scope>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index 8764cb8aad776233997e0be7606c7bcc916ff888..bd9f57d64f02b196133f76c91b465676b70e51ad 100644 (file)
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -73,12 +73,10 @@
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-extension-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.model</groupId>

diff --git a/pom.xml b/pom.xml
index 86690d70ba2248c1447b2a059aa9f7787e7c7f2a..74ea79e78b738788947d377ce7163938b4d8a995 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
       <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
       <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
       <openflowjava.version>0.6.0-SNAPSHOT</openflowjava.version>
-      <openflowplugin.model.version>${project.version}</openflowplugin.model.version>
+      <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
       <sal.api.version>0.9.0-SNAPSHOT</sal.api.version>
       <build.helper.version>1.8</build.helper.version>
       <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
@@ -74,6 +74,14 @@
 
     <dependencyManagement>
       <dependencies>
+        <dependency>
+          <groupId>org.opendaylight.openflowplugin</groupId>
+          <artifactId>openflowplugin-artifacts</artifactId>
+          <version>${openflowplugin.version}</version>
+          <scope>import</scope>
+          <type>pom</type>
+        </dependency>
+
         <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>yangtools-artifacts</artifactId>
@@ -116,28 +124,6 @@
          <scope>test</scope>
         </dependency>
 
-        <dependency>
-          <groupId>org.opendaylight.openflowplugin</groupId>
-          <artifactId>openflowplugin-api</artifactId>
-          <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.opendaylight.openflowplugin.model</groupId>
-          <artifactId>model-flow-base</artifactId>
-          <version>${openflowplugin.model.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.openflowplugin.model</groupId>
-          <artifactId>model-flow-service</artifactId>
-          <version>${openflowplugin.model.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.openflowplugin.model</groupId>
-          <artifactId>model-flow-statistics</artifactId>
-          <version>${openflowplugin.model.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>liblldp</artifactId>
@@ -486,6 +472,7 @@
     </profiles>
 
     <modules>
+      <module>artifacts</module>
       <module>openflowplugin-api</module>
       <module>openflowplugin</module>
       <module>openflowplugin-impl</module>