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

[lispflowmapping.git] / mappingservice / integrationtest / pom.xml

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>