Merge "Removed unused fields"

[openflowplugin.git] / distribution / karaf / pom.xml

diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index d147eee90df2a8d68d63319084f8e3a395d51036..94751698f08951c3f36b74907bdea8a3536aca86 100644 (file)
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -4,8 +4,8 @@
   <parent>
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+    <version>0.2.0-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
   </parent>
   <artifactId>openflowplugin-karaf</artifactId>
   <packaging>pom</packaging>
@@ -13,8 +13,8 @@
     <maven>3.0</maven>
   </prerequisites>
   <properties>
-    <branding.version>1.0.0-SNAPSHOT</branding.version>
-    <karaf.resources.version>1.4.2-SNAPSHOT</karaf.resources.version>
+    <branding.version>1.2.0-SNAPSHOT</branding.version>
+    <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
   </properties>
 
   <dependencies>
@@ -57,7 +57,13 @@
     <dependency>
       <artifactId>features-openflowplugin</artifactId>
       <groupId>org.opendaylight.openflowplugin</groupId>
-      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <artifactId>features-openflowplugin-li</artifactId>
+      <groupId>org.opendaylight.openflowplugin</groupId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
@@ -71,6 +77,21 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <!-- openflowplugin extension feature -->
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin-extension</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin-extension-li</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -159,14 +180,11 @@
       <plugin>
         <groupId>org.apache.karaf.tooling</groupId>
         <artifactId>karaf-maven-plugin</artifactId>
-        <version>${karaf.version}</version>
         <extensions>true</extensions>
         <configuration>
           <!-- no startupFeatures -->
           <bootFeatures>
             <feature>standard</feature>
-            <feature>odl-openflowplugin-flow-services</feature>
-            <feature>odl-restconf</feature>
           </bootFeatures>
           <!-- no installedFeatures -->
         </configuration>
@@ -178,12 +196,6 @@
             </goals>
             <phase>process-resources</phase>
           </execution>
-          <execution>
-            <id>package</id>
-            <goals>
-              <goal>instance-create-archive</goal>
-            </goals>
-          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -233,6 +245,22 @@
              <ignorePermissions>false</ignorePermissions>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+              <overWriteIfNewer>true</overWriteIfNewer>
+              <useRepositoryLayout>true</useRepositoryLayout>
+              <addParentPoms>true</addParentPoms>
+              <copyPom>true</copyPom>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -259,6 +287,30 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>create-karaf-archive</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.karaf.tooling</groupId>
+            <artifactId>karaf-maven-plugin</artifactId>
+            <extensions>true</extensions>
+            <executions>
+              <execution>
+                <id>package</id>
+                <goals>
+                  <goal>instance-create-archive</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>