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 6fcfe696e358c8e932af578280f3f11c3726a828..beb8bff8a5d7c029d67e7d087fb067d38e80079b 100644 (file)
--- a/mappingservice/integrationtest/pom.xml
+++ b/mappingservice/integrationtest/pom.xml
@@ -11,6 +11,12 @@
        </parent>
        <groupId>org.opendaylight.lispflowmapping</groupId>
        <artifactId>mappingservice.integrationtest</artifactId>
+       <scm>
+               <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
+               <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
+               <url>https://wiki.opendaylight.org/view/OpenDaylight_Lisp_Flow_Mapping:Main</url>
+               <tag>HEAD</tag>
+       </scm>
 
        <repositories>
                <!-- OpenDayLight Released artifact -->
@@ -29,7 +35,7 @@
        <build>
                <pluginManagement>
                        <plugins>
-                               
+
                                <plugin>
                                        <groupId>org.eclipse.m2e</groupId>
                                        <artifactId>lifecycle-mapping</artifactId>
@@ -123,7 +129,7 @@
                </plugins>
        </build>
        <properties>
-               <lispflowmapping.version>1.0.0-SNAPSHOT</lispflowmapping.version>
+               <lispflowmapping.version>1.1.0-SNAPSHOT</lispflowmapping.version>
                <exam.version>3.0.0</exam.version>
                <url.version>1.5.0</url.version>
                <!-- Sonar jacoco plugin to get integration test coverage info -->
@@ -137,6 +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>
        </properties>
        <dependencies>
 
@@ -150,6 +157,11 @@
                        <artifactId>sal-binding-it</artifactId>
                        <version>1.0-SNAPSHOT</version>
                </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>sal-binding-util</artifactId>
+                       <version>1.0-SNAPSHOT</version>
+               </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>sal-common-api</artifactId>
@@ -200,17 +212,28 @@
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>containermanager</artifactId>
-                       <version>0.5.0-SNAPSHOT</version>
+                       <version>0.5.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>netconf-impl</artifactId>
                        <version>${netconf.version}</version>
                </dependency>
+               <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>
-                       <version>0.5.0-SNAPSHOT</version>
+                       <version>0.5.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
@@ -218,6 +241,10 @@
                        <version>0.4.1-SNAPSHOT</version>
                </dependency>
 
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>protocol-framework</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>sal</artifactId>
@@ -226,12 +253,12 @@
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>clustering.services</artifactId>
-                       <version>0.4.1-SNAPSHOT</version>
+                       <version>0.5.0-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>clustering.stub</artifactId>
-                       <version>0.4.0-SNAPSHOT</version>
+                       <version>0.4.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>
@@ -271,7 +298,6 @@
                <dependency>
                        <groupId>commons-fileupload</groupId>
                        <artifactId>commons-fileupload</artifactId>
-                       <version>1.2.2</version>
                </dependency>
                <dependency>
                        <groupId>commons-codec</groupId>
@@ -280,83 +306,67 @@
                <dependency>
                        <groupId>equinoxSDK381</groupId>
                        <artifactId>javax.servlet</artifactId>
-                       <version>3.0.0.v201112011016</version>
                </dependency>
                <dependency>
                        <groupId>equinoxSDK381</groupId>
                        <artifactId>javax.servlet.jsp</artifactId>
-                       <version>2.2.0.v201112011158</version>
                </dependency>
                <dependency>
                        <groupId>equinoxSDK381</groupId>
                        <artifactId>org.eclipse.equinox.ds</artifactId>
-                       <version>1.4.0.v20120522-1841</version>
                </dependency>
                <dependency>
                        <groupId>equinoxSDK381</groupId>
                        <artifactId>org.eclipse.equinox.util</artifactId>
-                       <version>1.0.400.v20120522-2049</version>
                </dependency>
                <dependency>
                        <groupId>equinoxSDK381</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
-                       <version>3.8.1.v20120830-144521</version>
                </dependency>
                <dependency>
                        <groupId>equinoxSDK381</groupId>
                        <artifactId>org.apache.felix.gogo.command</artifactId>
-                       <version>0.8.0.v201108120515</version>
                </dependency>
                <dependency>
                        <groupId>equinoxSDK381</groupId>
                        <artifactId>org.apache.felix.gogo.runtime</artifactId>
-                       <version>0.8.0.v201108120515</version>
                </dependency>
                <dependency>
                        <groupId>equinoxSDK381</groupId>
                        <artifactId>org.apache.felix.gogo.shell</artifactId>
-                       <version>0.8.0.v201110170705</version>
                </dependency>
                <dependency>
                        <groupId>equinoxSDK381</groupId>
                        <artifactId>org.eclipse.equinox.cm</artifactId>
-                       <version>1.0.400.v20120522-1841</version>
                </dependency>
                <dependency>
                        <groupId>equinoxSDK381</groupId>
                        <artifactId>org.eclipse.equinox.console</artifactId>
-                       <version>1.0.0.v20120522-1841</version>
                </dependency>
                <dependency>
                        <groupId>equinoxSDK381</groupId>
                        <artifactId>org.eclipse.equinox.launcher</artifactId>
-                       <version>1.3.0.v20120522-1813</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.felix</groupId>
                        <artifactId>org.apache.felix.dependencymanager</artifactId>
-                       <version>3.1.0</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.felix</groupId>
                        <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
-                       <version>3.0.1</version>
                </dependency>
                <dependency>
                        <groupId>com.google.code.gson</groupId>
                        <artifactId>gson</artifactId>
-                       <version>2.1</version>
                        <scope>compile</scope>
                </dependency>
                <dependency>
                        <groupId>org.jboss.spec.javax.transaction</groupId>
                        <artifactId>jboss-transaction-api_1.1_spec</artifactId>
-                       <version>1.0.1.Final</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.felix</groupId>
                        <artifactId>org.apache.felix.fileinstall</artifactId>
-                       <version>3.1.6</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.commons</groupId>
@@ -366,115 +376,95 @@
                <dependency>
                        <groupId>virgomirror</groupId>
                        <artifactId>org.eclipse.jdt.core.compiler.batch</artifactId>
-                       <version>3.8.0.I20120518-2145</version>
                </dependency>
                <dependency>
                        <groupId>eclipselink</groupId>
                        <artifactId>javax.persistence</artifactId>
-                       <version>2.0.4.v201112161009</version>
                </dependency>
                <dependency>
                        <groupId>eclipselink</groupId>
                        <artifactId>javax.resource</artifactId>
-                       <version>1.5.0.v200906010428</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>javax.activation</artifactId>
-                       <version>1.1.0.v201211130549</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>javax.annotation</artifactId>
-                       <version>1.1.0.v201209060031</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>javax.ejb</artifactId>
-                       <version>3.1.1.v201204261316</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>javax.el</artifactId>
-                       <version>2.2.0.v201108011116</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>javax.mail.glassfish</artifactId>
-                       <version>1.4.1.v201108011116</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>javax.xml.rpc</artifactId>
-                       <version>1.1.0.v201005080400</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>org.apache.catalina</artifactId>
-                       <version>7.0.32.v201211201336</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>org.apache.catalina.ha</artifactId>
-                       <version>7.0.32.v201211201952</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>org.apache.catalina.tribes</artifactId>
-                       <version>7.0.32.v201211201952</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>org.apache.coyote</artifactId>
-                       <version>7.0.32.v201211201952</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>org.apache.el</artifactId>
-                       <version>7.0.32.v201211081135</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>org.apache.jasper</artifactId>
-                       <version>7.0.32.v201211201952</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>org.apache.juli.extras</artifactId>
-                       <version>7.0.32.v201211081135</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>org.apache.tomcat.api</artifactId>
-                       <version>7.0.32.v201211081135</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>org.apache.tomcat.util</artifactId>
-                       <version>7.0.32.v201211201952</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>javax.servlet.jsp.jstl</artifactId>
-                       <version>1.2.0.v201105211821</version>
                </dependency>
                <dependency>
                        <groupId>orbit</groupId>
                        <artifactId>javax.servlet.jsp.jstl.impl</artifactId>
-                       <version>1.2.0.v201210211230</version>
                </dependency>
                <!-- Add Pax Exam -->
                <dependency>
-            <exclusions>
-                <exclusion>  <!-- declare the exclusion here -->
-                    <groupId>org.ops4j.pax.exam</groupId>
-                    <artifactId>pax-exam-container-native</artifactId>
-                </exclusion>
-            </exclusions>
+                       <exclusions>
+                               <exclusion>  <!-- declare the exclusion here -->
+                                       <groupId>org.ops4j.pax.exam</groupId>
+                                       <artifactId>pax-exam-container-native</artifactId>
+                               </exclusion>
+                       </exclusions>
                        <groupId>org.ops4j.pax.exam</groupId>
                        <artifactId>pax-exam-container-forked</artifactId>
                        <scope>test</scope>
-            <version>${exam.version}</version>
+                       <version>${exam.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.ops4j.pax.exam</groupId>
@@ -497,7 +487,6 @@
                <dependency>
                        <groupId>org.ow2.asm</groupId>
                        <artifactId>asm-all</artifactId>
-                       <version>4.1</version>
                </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
@@ -542,7 +531,6 @@
                <dependency>
                        <groupId>org.aopalliance</groupId>
                        <artifactId>com.springsource.org.aopalliance</artifactId>
-                       <version>1.0.0</version>
                </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
@@ -579,7 +567,6 @@
                <dependency>
                        <groupId>org.ow2.chameleon.management</groupId>
                        <artifactId>chameleon-mbeans</artifactId>
-                       <version>1.0.0</version>
                </dependency>
                <!-- Jersey for JAXRS -->
                <dependency>
@@ -587,6 +574,11 @@
                        <artifactId>jersey-core</artifactId>
                        <version>${jersey.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>com.sun.jersey</groupId>
+                       <artifactId>jersey-json</artifactId>
+                       <version>${jersey.version}</version>
+               </dependency>
                <dependency>
                        <groupId>com.sun.jersey</groupId>
                        <artifactId>jersey-server</artifactId>
@@ -597,6 +589,11 @@
                        <artifactId>jersey-client</artifactId>
                        <version>${jersey.version}</version>
                </dependency>
+               <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-json</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
                <dependency>
                        <groupId>org.opendaylight.yangtools.thirdparty</groupId>
                        <artifactId>xtend-lib-osgi</artifactId>
@@ -618,27 +615,25 @@
                        <version>1.0-SNAPSHOT</version>
                </dependency>
                <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-netconf-connector</artifactId>
-            <version>${netconf.version}</version>
-            <scope>test</scope>
-        </dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>config-netconf-connector</artifactId>
+                       <version>${netconf.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <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>
-          <version>${mdsal.version}</version>
-        </dependency>
+                       <groupId>org.opendaylight.controller.model</groupId>
+                       <artifactId>model-inventory</artifactId>
+                       <version>${mdsal.version}</version>
+               </dependency>
                <dependency>
                        <groupId>org.javassist</groupId>
                        <artifactId>javassist</artifactId>
-                       <version>3.17.1-GA</version>
                </dependency>
-               <dependency>
-                         <groupId>org.opendaylight.controller.thirdparty</groupId>
-                         <artifactId>exificient</artifactId>
-                         <version>0.9.2-SNAPSHOT</version>
-               </dependency>
-
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>config-manager</artifactId>
@@ -648,37 +643,37 @@
                        <groupId>org.opendaylight.controller.thirdparty</groupId>
                        <artifactId>com.sun.jersey.jersey-servlet</artifactId>
                </dependency>
-               
+
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-annotations</artifactId>
+                       <version>${jackson.version}</version>
+               </dependency>
+
                <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-core</artifactId>
+                       <version>${jackson.version}</version>
+               </dependency>
 
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-databind</artifactId>
+                       <version>${jackson.version}</version>
+               </dependency>
 
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
-    
-    <dependency>
-       <groupId>com.fasterxml.jackson.jaxrs</groupId>
-       <artifactId>jackson-jaxrs-json-provider</artifactId>
-       <version>${jackson.version}</version>
-    </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                       <artifactId>jackson-jaxrs-json-provider</artifactId>
+                       <version>${jackson.version}</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                       <artifactId>jackson-jaxrs-base</artifactId>
+                       <version>${jackson.version}</version>
+               </dependency>
 
-      <dependency>
-         <groupId>com.fasterxml.jackson.jaxrs</groupId>
-         <artifactId>jackson-jaxrs-base</artifactId>
-         <version>${jackson.version}</version>
-      </dependency>
-    
                <dependency>
                        <groupId>org.codehaus.jackson</groupId>
                        <artifactId>jackson-mapper-asl</artifactId>
@@ -702,7 +697,6 @@
                <dependency>
                        <groupId>org.codehaus.jettison</groupId>
                        <artifactId>jettison</artifactId>
-                       <version>1.3.3</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
@@ -729,6 +723,36 @@
                        <artifactId>switchmanager.implementation</artifactId>
                        <version>0.4.1-SNAPSHOT</version>
                </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>forwardingrulesmanager</artifactId>
+                       <version>0.5.0-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>hosttracker</artifactId>
+                       <version>${hosttracker.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>topologymanager</artifactId>
+                       <version>0.4.1-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>forwardingrulesmanager.implementation</artifactId>
+                       <version>0.4.1-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>statisticsmanager</artifactId>
+                       <version>0.5.0-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>statisticsmanager.implementation</artifactId>
+                       <version>0.4.1-SNAPSHOT</version>
+               </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>connectionmanager</artifactId>
@@ -870,12 +894,16 @@
                        <version>0.2.3-SNAPSHOT</version>
                </dependency>
 
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>1.4.01</version>
-        </dependency>
-    </dependencies>
+               <dependency>
+                       <groupId>org.opendaylight.yangtools</groupId>
+                       <artifactId>mockito-configuration</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>xml-apis</groupId>
+                       <artifactId>xml-apis</artifactId>
+                       <version>1.4.01</version>
+               </dependency>
+       </dependencies>
 
        <profiles>
                <profile>