Cherry pick of 22633 to master

Change-Id: I7a760a6dfe6e4964cadb93814dae34b2a12390a6
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>

diff --git a/integration/test/pom.xml b/integration/test/pom.xml
index 3ce4b7c5b4fe6f3339818195e4c2353ccdda36f7..f2e3e718471288c7db74c1b28192d5b97ce5c5bd 100644 (file)
--- a/integration/test/pom.xml
+++ b/integration/test/pom.xml
@@ -26,6 +26,12 @@
       <artifactId>dummyprovider</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>neutron-karaf</artifactId>
+      <version>${project.version}</version>
+      <type>zip</type>
+    </dependency>
   </dependencies>
 
   <build>
@@ -39,6 +45,18 @@
       </plugins>
     </pluginManagement>
     <plugins>
+      <plugin>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>maven-paxexam-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-config</id>
+            <goals>
+              <goal>generate-depends-file</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronE2ETest.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronE2ETest.java
index 23f002a6ab16564f2764d124b34c0e5554be56db..97df7803058f62987058d63282a102bf9ff469f1 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronE2ETest.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronE2ETest.java
@@ -57,7 +57,7 @@ public class NeutronE2ETest {
                         .groupId("org.opendaylight.neutron")
                         .artifactId("neutron-karaf")
                         .type("zip")
-                        .version("0.6.0-SNAPSHOT"))
+                        .versionAsInProject())
                 .karafVersion("3.0.3")
                 .name("Neutron")
                 .unpackDirectory(new File("target/pax"))