From: Ryan Goulding <ryandgoulding@gmail.com>
Date: Thu, 26 May 2016 13:13:13 +0000 (-0400)
Subject: Remove duplicate property assignment
X-Git-Tag: release/boron~170
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=e0d0751c4435d04689f3c6f430c98731e9930af6

Remove duplicate property assignment

mdsal.version is assigned twice, though it appears the only use of the
property is WRT controller mdsal artifacts.  I have removed the first
assignment, which was overwritten by the second assignment.

Change-Id: I320fa7c4124969ff3a384cf250879cf3f103d664
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
---

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index c97a10243f..20a6beaf7e 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -14,7 +14,6 @@
   <packaging>pom</packaging>
 
   <properties>
-    <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
     <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
     <appauth.version>0.7.0-SNAPSHOT</appauth.version>
     <archetype-app-northbound>0.3.0-SNAPSHOT</archetype-app-northbound>
@@ -93,6 +92,7 @@
     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
     <logging.bridge.version>0.7.0-SNAPSHOT</logging.bridge.version>
     <maven.plugin.api.version>3.0.5</maven.plugin.api.version>
+    <!-- mdsal version for controller, not mdsal -->
     <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
     <networkconfig.bridgedomain.northbound.version>0.3.0-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
     <!-- ODL repository / plugin repository -->