Merge remote branch 'origin/release-1.0.X' into mer

Conflicts:
	mappingservice/integrationtest/pom.xml

Change-Id: I62fc34b7c566198dc62ee1d20026ded5e579f303
Signed-off-by: David Goldberg <david.goldberg@contextream.com>

diff --git a/commons/code-parent/pom.xml b/commons/code-parent/pom.xml
index 082c72563e273ddbcbfb1041ceefeb5330d9cd6f..4f2166c82f956d112b1ca7954d7401423a8a2a0e 100644 (file)
--- a/commons/code-parent/pom.xml
+++ b/commons/code-parent/pom.xml
@@ -22,7 +22,6 @@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>common.unittest.tools</artifactId>
-                       <version>${lispflowmapping.version}</version>
                        <scope>test</scope>
                </dependency>
                        <dependency>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 79474941deff3d72e21febaf2ca9f89a39917698..903d53017cb9500d905346197fc9afa9142b95f5 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -40,6 +40,7 @@
                <java.version.source>1.7</java.version.source>
                <java.version.target>1.7</java.version.target>
                <releaseplugin.version>2.3.2</releaseplugin.version>
+               <slf4j.version>1.7.2</slf4j.version>
        </properties>
        
        <repositories>
@@ -130,7 +131,6 @@
                                <artifactId>clustering.services</artifactId>
                                <version>0.5.0-SNAPSHOT</version>
                        </dependency>
-
                        <dependency>
                                <groupId>org.opendaylight.yangtools</groupId>
                                <artifactId>yang-binding</artifactId>
@@ -221,7 +221,27 @@
                                <artifactId>config-api</artifactId>
                                <version>0.2.3-SNAPSHOT</version>
                        </dependency>
-
+            <dependency>
+              <groupId>org.opendaylight.lispflowmapping</groupId>
+              <artifactId>mappingservice.yangmodel</artifactId>
+              <version>${lispflowmapping.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.opendaylight.lispflowmapping</groupId>
+              <artifactId>mappingservice.api</artifactId>
+              <version>${lispflowmapping.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.opendaylight.lispflowmapping</groupId>
+              <artifactId>mappingservice.implementation</artifactId>
+              <version>${lispflowmapping.version}</version>
+            </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.lispflowmapping</groupId>
+                       <artifactId>common.unittest.tools</artifactId>
+                       <version>${lispflowmapping.version}</version>
+                       <scope>test</scope>
+               </dependency>
                </dependencies>
        </dependencyManagement>
 

diff --git a/commons/unittest_tools/pom.xml b/commons/unittest_tools/pom.xml
index fad6751581841b711a563bbd004530df84bec2b2..9aa8591fb2acb73a06926a0b1d902f37966d51f5 100644 (file)
--- a/commons/unittest_tools/pom.xml
+++ b/commons/unittest_tools/pom.xml
@@ -47,7 +47,7 @@
                <dependency>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-api</artifactId>
-<version>1.6.1</version>
+<version>${slf4j.version}</version>
 </dependency>
                
        </dependencies>

diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index 9173fdeb776e8bd07426790f33cc00fa810666fc..508dced01b9519b004b70e7edc248274b0131601 100644 (file)
--- a/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@ -78,7 +78,6 @@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.yangmodel</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
        </dependencies>
 </project>

diff --git a/mappingservice/config/pom.xml b/mappingservice/config/pom.xml
index 7342eb1706031a587c09c08677f016b76abc447c..44a0713f133ebbec363e4b1f94bcd8d32e893384 100644 (file)
--- a/mappingservice/config/pom.xml
+++ b/mappingservice/config/pom.xml
@@ -150,7 +150,6 @@
        <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.api</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.yangtools</groupId>

diff --git a/mappingservice/config/src/main/java/org/opendaylight/lispflowmapping/config/yang/LispConfigModule.java b/mappingservice/config/src/main/java/org/opendaylight/lispflowmapping/config/yang/LispConfigModule.java
index 1f6aec8b5e5d449166a0507ac8be131a67a981c5..d5c057ffe963a50c63e33835119b49e3367428ee 100644 (file)
--- a/mappingservice/config/src/main/java/org/opendaylight/lispflowmapping/config/yang/LispConfigModule.java
+++ b/mappingservice/config/src/main/java/org/opendaylight/lispflowmapping/config/yang/LispConfigModule.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Contextream, 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
+ */
 /**
  * Generated file
 

diff --git a/mappingservice/config/src/main/java/org/opendaylight/lispflowmapping/config/yang/LispConfigModuleFactory.java b/mappingservice/config/src/main/java/org/opendaylight/lispflowmapping/config/yang/LispConfigModuleFactory.java
index a480a9d78327c14bec04605c4309e3e82a806a19..350b8b7fed3e7aab488403ac01210b8951e4f4b3 100644 (file)
--- a/mappingservice/config/src/main/java/org/opendaylight/lispflowmapping/config/yang/LispConfigModuleFactory.java
+++ b/mappingservice/config/src/main/java/org/opendaylight/lispflowmapping/config/yang/LispConfigModuleFactory.java
@@ -1,12 +1,19 @@
+/*
+ * Copyright (c) 2014 Contextream, 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
+ */
 /**
-* Generated file
+ * Generated file
 
-* Generated from: yang module name: config-lisp  yang module local name: lispconfig
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Nov 13 19:35:03 IST 2013
-*
-* Do not modify this file unless it is present under src/main directory
-*/
+ * Generated from: yang module name: config-lisp  yang module local name: lispconfig
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Wed Nov 13 19:35:03 IST 2013
+ *
+ * Do not modify this file unless it is present under src/main directory
+ */
 
 /*
  * Copyright (c) 2014 Contextream, Inc. and others.  All rights reserved.
@@ -20,8 +27,6 @@ package org.opendaylight.lispflowmapping.config.yang;
 /**
 *
 */
-public class LispConfigModuleFactory extends org.opendaylight.lispflowmapping.config.yang.AbstractLispConfigModuleFactory
-{
-
+public class LispConfigModuleFactory extends org.opendaylight.lispflowmapping.config.yang.AbstractLispConfigModuleFactory {
 
 }

diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml
index 427c90d1d25389208d7c13f8128964bddf318ef9..cd0ee2e7465afeae947964170ed5b58a8ae939ca 100644 (file)
--- a/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@ -120,12 +120,10 @@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.yangmodel</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.api</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
                <dependency>
                        <groupId>equinoxSDK381</groupId>

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
index 0e5cb2f8b8647f8ee20705193d3f1cc6308dc175..5c773e48fff6e5896cd2c064bccceef4f79cc989 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Contextream, 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
+ */
 package org.opendaylight.lispflowmapping.implementation.util;
 
 import java.net.Inet4Address;

diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/authentication/LispAuthenticationTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/authentication/LispAuthenticationTest.java
index 204c1442119a388c8c6b656a98d84d3d106dc235..ce321445ff86a79839284e88ea141a7c6c77fa27 100644 (file)
--- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/authentication/LispAuthenticationTest.java
+++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/authentication/LispAuthenticationTest.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Contextream, 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
+ */
 package org.opendaylight.lispflowmapping.implementation.authentication;
 
 import static junit.framework.Assert.assertTrue;

diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolverTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolverTest.java
index 696a0fd8ac41ec79b49bf62e9bc1bfa86c14b4c1..25e80c5a440629494b86da78937add892cb33d7a 100644 (file)
--- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolverTest.java
+++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolverTest.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Contextream, 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
+ */
 package org.opendaylight.lispflowmapping.implementation.lisp;
 
 import static org.junit.Assert.assertEquals;
@@ -36,14 +43,6 @@ import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.maprequest.ItrRloc
 import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.maprequest.SourceEidBuilder;
 import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.maprequestnotification.MapRequestBuilder;
 
-/*
- * Copyright (c) 2014 Contextream, 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
- */
-
 public class MapResolverTest extends BaseTestCase {
 
     // private MapResolver testedMapResolver;

diff --git a/mappingservice/integrationtest/pom.xml b/mappingservice/integrationtest/pom.xml
index 2278b3ae41a4e487a1a7bfff0ddd6452d7e5ca27..beb8bff8a5d7c029d67e7d087fb067d38e80079b 100644 (file)
--- a/mappingservice/integrationtest/pom.xml
+++ b/mappingservice/integrationtest/pom.xml
@@ -143,7 +143,7 @@
                <junit.version>4.8.1</junit.version>
                <xtend.version>2.4.3</xtend.version>
                <old-jackson.version>1.9.8</old-jackson.version>
-                <hosttracker.version>0.5.1-SNAPSHOT</hosttracker.version>
+               <hosttracker.version>0.5.1-SNAPSHOT</hosttracker.version>
        </properties>
        <dependencies>
 
@@ -220,11 +220,16 @@
                        <version>${netconf.version}</version>
                </dependency>
                <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>${osgi.core.version}</version>
-            <scope>provided</scope>
-        </dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>netconf-util</artifactId>
+                       <version>${netconf.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.osgi</groupId>
+                       <artifactId>org.osgi.core</artifactId>
+                       <version>${osgi.core.version}</version>
+                       <scope>provided</scope>
+               </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>containermanager.it.implementation</artifactId>
@@ -616,10 +621,10 @@
                        <scope>test</scope>
                </dependency>
                <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-persister-file-xml-adapter</artifactId>
-            <version>${config.version}</version>
-        </dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>config-persister-file-xml-adapter</artifactId>
+                       <version>${config.version}</version>
+               </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller.model</groupId>
                        <artifactId>model-inventory</artifactId>
@@ -629,11 +634,6 @@
                        <groupId>org.javassist</groupId>
                        <artifactId>javassist</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller.thirdparty</groupId>
-                       <artifactId>exificient</artifactId>
-               </dependency>
-
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>config-manager</artifactId>

diff --git a/mappingservice/northbound/pom.xml b/mappingservice/northbound/pom.xml
index 3ddf233bef907e21e51a28976f9784d82e8ccf16..c1e37a0040cfcae10ae1c7440f33de78bdc2126e 100644 (file)
--- a/mappingservice/northbound/pom.xml
+++ b/mappingservice/northbound/pom.xml
@@ -22,7 +22,7 @@
                        <plugin>
                                <groupId>org.codehaus.enunciate</groupId>
                                <artifactId>maven-enunciate-plugin</artifactId>
-                               <version>1.27</version>
+                               <version>${enunciate.version}</version>
                                <!-- <dependencies> <dependency> <groupId>org.opendaylight.controller</groupId> 
                                        <artifactId>sal</artifactId> <version>0.5.0-SNAPSHOT</version> </dependency> 
                                        <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>clustering.services</artifactId> 
@@ -108,13 +108,11 @@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.yangmodel</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.api</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
 
                <dependency>
@@ -141,7 +139,7 @@
                <dependency>
                        <groupId>org.codehaus.enunciate</groupId>
                        <artifactId>enunciate-core-annotations</artifactId>
-                       <version>1.27</version>
+                       <version>${enunciate.version}</version>
                </dependency>
 
        </dependencies>

diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 5082ea6a61b128b6ab06d95b5f77b74b84036bd7..8bc9849795e49851d79fd9a42d2a6d15c253bdd5 100644 (file)
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -32,8 +32,6 @@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>common.unittest.tools</artifactId>
-                       <version>${lispflowmapping.version}</version>
-                       <scope>test</scope>
                </dependency>
                        <dependency>
                                <groupId>junit</groupId>

diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml
index 88b56919b3781e9f316e23578ff7d69ea70093e9..dd608237ec55b4eda9fd02a2880ca2701565492c 100644 (file)
--- a/mappingservice/southbound/pom.xml
+++ b/mappingservice/southbound/pom.xml
@@ -76,12 +76,10 @@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.api</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.implementation</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
        </dependencies>
 </project>