Merge "Fix distribution generation"

[netconf.git] / karaf / pom.xml

diff --git a/karaf/pom.xml b/karaf/pom.xml
index e76fabaa1252b821ddd5adfc981e70da413d31f0..af56eea75f4f3fa4adac64ef93b9bcebede33bb2 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,16 +11,16 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>1.9.0</version>
+    <version>4.0.8</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-karaf</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
+  <version>1.9.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <properties>
-    <netconf.version>1.3.0-SNAPSHOT</netconf.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
+    <netconf.version>1.6.0-SNAPSHOT</netconf.version>
+    <restconf.version>1.9.0-SNAPSHOT</restconf.version>
   </properties>
 
   <dependencies>
@@ -33,7 +33,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features4-netconf</artifactId>
+      <artifactId>features-netconf</artifactId>
       <version>${netconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
@@ -41,7 +41,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features4-netconf-connector</artifactId>
+      <artifactId>features-netconf-connector</artifactId>
       <version>${netconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
@@ -49,7 +49,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features4-restconf</artifactId>
+      <artifactId>features-restconf</artifactId>
       <version>${restconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
@@ -57,7 +57,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features4-yanglib</artifactId>
+      <artifactId>features-yanglib</artifactId>
       <version>${netconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
@@ -81,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>