Bump MRI upstreams

[lispflowmapping.git] / integrationtest / pom.xml

diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index f1e8dac74e24d02b5cde736788572dcdc3757f6b..c1a041f0761edf4511054330484768a2bac08a2c 100644 (file)
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+Copyright (c) 2015, 2017 Cisco Systems, 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,
@@ -11,14 +11,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>mdsal-it-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>6.0.2</version>
     <relativePath/>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>mappingservice.integrationtest</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.16.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
@@ -27,23 +27,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <properties>
     <skipITs>false</skipITs>
     <karaf.distro.groupId>org.opendaylight.lispflowmapping</karaf.distro.groupId>
-    <karaf.distro.artifactId>distribution-karaf</karaf.distro.artifactId>
-    <karaf.distro.version>1.5.0-SNAPSHOT</karaf.distro.version>
+    <karaf.distro.artifactId>lispflowmapping-karaf</karaf.distro.artifactId>
+    <karaf.distro.version>1.16.0-SNAPSHOT</karaf.distro.version>
     <karaf.distro.type>zip</karaf.distro.type>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>distribution-karaf</artifactId>
+      <artifactId>lispflowmapping-karaf</artifactId>
       <version>${project.version}</version>
       <type>zip</type>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>features-lispflowmapping</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <!--
          Will need to add this back once we create tests over HTTP
     <dependency>
@@ -53,6 +48,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     -->
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>ignore-lispflowmapping-integrationtest</id>
+      <properties>
+        <maven.test.failure.ignore>true</maven.test.failure.ignore>
+      </properties>
+    </profile>
+  </profiles>
+
   <build>
     <pluginManagement>
       <plugins>
@@ -86,21 +90,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       </plugins>
     </pluginManagement>
   </build>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
-
 </project>