From 657948e640c88a637fc69ceb81fb739a7f780c99 Mon Sep 17 00:00:00 2001
From: Lorand Jakab <lojakab@cisco.com>
Date: Wed, 22 Feb 2017 23:07:31 +0200
Subject: [PATCH] Migrate IT to use the Karaf 4 distribution

Change-Id: Iecef5c6745bcee3853810303815199c12b6957a5
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
---
 integrationtest/pom.xml                                     | 6 +++---
 .../integrationtest/MappingServiceIntegrationTest.java      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index f1e8dac74..b74794e47 100644
--- 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,
@@ -27,7 +27,7 @@ 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.artifactId>lispflowmapping-karaf</karaf.distro.artifactId>
     <karaf.distro.version>1.5.0-SNAPSHOT</karaf.distro.version>
     <karaf.distro.type>zip</karaf.distro.type>
   </properties>
@@ -35,7 +35,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>distribution-karaf</artifactId>
+      <artifactId>lispflowmapping-karaf</artifactId>
       <version>${project.version}</version>
       <type>zip</type>
     </dependency>
diff --git a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
index 683b3f9a9..fdd883e8c 100644
--- a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
+++ b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Contextream, Inc. and others.  All rights reserved.
+ * Copyright (c) 2014, 2017 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,
@@ -183,7 +183,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase {
     public String getKarafDistro() {
         return maven()
                 .groupId("org.opendaylight.lispflowmapping")
-                .artifactId("distribution-karaf")
+                .artifactId("lispflowmapping-karaf")
                 .versionAsInProject()
                 .type("zip")
                 .getURL();
@@ -193,7 +193,7 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase {
     public MavenUrlReference getFeatureRepo() {
         return maven()
                 .groupId("org.opendaylight.lispflowmapping")
-                .artifactId("features-lispflowmapping")
+                .artifactId("features4-lispflowmapping")
                 .classifier("features")
                 .type("xml")
                 .versionAsInProject();
-- 
2.36.6