Merge "Fix distribution generation"

[netconf.git] / karaf / pom.xml

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 54f7fe93ec3dbdd789ce61b1d9e6c743b0bb4848..af56eea75f4f3fa4adac64ef93b9bcebede33bb2 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -10,20 +10,17 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf-parent</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-    <relativePath></relativePath>
+    <artifactId>karaf4-parent</artifactId>
+    <version>4.0.8</version>
+    <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-karaf</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <properties>
-    <netconf.version>1.2.0-SNAPSHOT</netconf.version>
-    <restconf.version>1.5.0-SNAPSHOT</restconf.version>
+    <netconf.version>1.6.0-SNAPSHOT</netconf.version>
+    <restconf.version>1.9.0-SNAPSHOT</restconf.version>
   </properties>
 
   <dependencies>
@@ -84,8 +81,28 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>karaf-plugin</artifactId>
+        <version>4.0.9-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>populate-local-repo</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>populate-local-repo</goal>
+            </goals>
+            <configuration>
+              <localRepo>${project.build.directory}/assembly/system</localRepo>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
+
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netconf.git</developerConnection>