Remove hardcoded karaf version from IT

This allows the version bumping scripts to work without the need to
manually modify a Java file.

Change-Id: Ief4ef577fbfcc17ef842284cf432b976a671faf5
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/mappingservice/integrationtest/pom.xml b/mappingservice/integrationtest/pom.xml
index f20f6e30c8ea2550caadf73337b8b8ab22c147d3..44fd949d64a56e3045a19c24d77395488dc07801 100644 (file)
--- a/mappingservice/integrationtest/pom.xml
+++ b/mappingservice/integrationtest/pom.xml
@@ -31,6 +31,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>distribution-karaf</artifactId>
+      <version>${project.version}</version>
+      <type>zip</type>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>features-lispflowmapping</artifactId>

diff --git a/mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java b/mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
index 64b35e032dac1d507764a9133db3b81a579dfc4b..d73ea09a51d386122b314705d58f08b3090df286 100644 (file)
--- a/mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
+++ b/mappingservice/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
@@ -157,13 +157,12 @@ public class MappingServiceIntegrationTest extends AbstractMdsalTestBase {
     }
 
     // This is temporary, since the properties in the pom file are not picked up
-    // .versionAsInProject() doesn't work here, and this makes version bumping difficult
     @Override
     public String getKarafDistro() {
         return maven()
                 .groupId("org.opendaylight.lispflowmapping")
                 .artifactId("distribution-karaf")
-                .version("1.3.0-SNAPSHOT")
+                .versionAsInProject()
                 .type("zip")
                 .getURL();
     }