Remove contact info from pom.xml & fix version inheritance.

Change-Id: Iba2dd49409e3f8f41106d3851d1f3336c92b3207
Signed-off-by: Alex Fan <railor33@gmail.com>

diff --git a/endpointtracker/model/pom.xml b/endpointtracker/model/pom.xml
index eab922019acbb6608f5e51b597abec7ddb676056..1df82754c516ff6a435421410b1d265a2b666166 100644 (file)
--- a/endpointtracker/model/pom.xml
+++ b/endpointtracker/model/pom.xml
@@ -15,22 +15,18 @@
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-inventory</artifactId>
-      <version>${mdsal.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-binding</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
-      <version>${ietf-yang-types.version}</version>
     </dependency>
   </dependencies>
 

diff --git a/packethandler/implementation/pom.xml b/packethandler/implementation/pom.xml
index 59c7ae3c60658f72a35d97305a57bce78ec43f23..17b4d3fa898958c2cd333cda9eb49fc3b4ed9c63 100644 (file)
--- a/packethandler/implementation/pom.xml
+++ b/packethandler/implementation/pom.xml
@@ -15,7 +15,6 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
-      <version>${adsal.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch.packethandler</groupId>

diff --git a/packethandler/model/pom.xml b/packethandler/model/pom.xml
index b7774e8e7bdfe266d62c36124177f7cbb12a2d3b..938538e4bc161e2f3450949235af4efa9138753a 100644 (file)
--- a/packethandler/model/pom.xml
+++ b/packethandler/model/pom.xml
@@ -15,12 +15,10 @@
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-flow-service</artifactId>
-      <version>${mdsal.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
-      <version>${ietf-yang-types.version}</version>
     </dependency>
   </dependencies>
 

diff --git a/packethandler/model/src/main/yang/ethernet-packet.yang b/packethandler/model/src/main/yang/ethernet-packet.yang
index 23e23e1e4a1043b5f3730f35f72348d06723f4ef..1bcb48bfdb605428e501e7319c28e90263b90705 100644 (file)
--- a/packethandler/model/src/main/yang/ethernet-packet.yang
+++ b/packethandler/model/src/main/yang/ethernet-packet.yang
@@ -12,9 +12,6 @@ module ethernet-packet {
     revision-date 2013-07-09;
   }
 
-  organization "Cisco Systems Inc";
-  contact "Alex Fan <alefan@cisco.com>";
-
   revision 2014-05-28 {
     description
       "Packet types module draft.";

diff --git a/parent/pom.xml b/parent/pom.xml
index b7bef6f1baa8ebbe00fee33c7fe5a53630565a54..96c8925df74f73c42297d29c132519f68c8a8503 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,6 +21,41 @@
     <ietf-yang-types.version>2010.09.24.4-SNAPSHOT</ietf-yang-types.version>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>sal</artifactId>
+        <version>${adsal.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller.model</groupId>
+        <artifactId>model-flow-service</artifactId>
+        <version>${mdsal.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller.model</groupId>
+        <artifactId>model-inventory</artifactId>
+        <version>${mdsal.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yang-binding</artifactId>
+        <version>${yangtools.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yang-common</artifactId>
+        <version>${yangtools.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools.model</groupId>
+        <artifactId>ietf-yang-types</artifactId>
+        <version>${ietf-yang-types.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <repositories>
     <!-- OpenDayLight Repo Mirror -->
     <repository>