X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=karaf%2Fkaraf-parent%2Fpom.xml;h=958f2b884cf2075b8b9a62a72f176439ada6bb5f;hp=c8784a880db3ab630271e19a59aa4153edd4794b;hb=783679071e01620bfc468cb9f9472f2a1030ae00;hpb=18cefe8da04b98855683d75be276b9f0e8f3ae73;ds=sidebyside

diff --git a/karaf/karaf-parent/pom.xml b/karaf/karaf-parent/pom.xml
index c8784a880d..958f2b884c 100644
--- a/karaf/karaf-parent/pom.xml
+++ b/karaf/karaf-parent/pom.xml
@@ -19,12 +19,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <artifactId>karaf-parent</artifactId>
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
+
   <properties>
     <branding.version>1.1.0-SNAPSHOT</branding.version>
     <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
+    <karaf.localFeature>standard</karaf.localFeature>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -49,6 +48,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependencies>
   </dependencyManagement>
   <dependencies>
+    <!-- karaf standard features -->
+    <dependency>
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>standard</artifactId>
+      <version>${karaf.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
+      <scope>runtime</scope>
+    </dependency>
     <!-- ODL Branding -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -178,6 +186,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <!-- no startupFeatures -->
             <bootFeatures>
               <feature>standard</feature>
+              <feature>${karaf.localFeature}</feature>
             </bootFeatures>
             <!-- no installedFeatures -->
           </configuration>
@@ -287,6 +296,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                 <overWriteSnapshots>true</overWriteSnapshots>
               </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>
+                <excludeArtifactIds>distribution.vtn-coordinator</excludeArtifactIds>
+                <overWriteReleases>false</overWriteReleases>
+                <overWriteSnapshots>true</overWriteSnapshots>
+                <overWriteIfNewer>true</overWriteIfNewer>
+                <useRepositoryLayout>true</useRepositoryLayout>
+                <addParentPoms>true</addParentPoms>
+                <copyPom>true</copyPom>
+              </configuration>
+            </execution>
           </executions>
         </plugin>
         <plugin>
@@ -319,6 +345,26 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       </plugins>
     </pluginManagement>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>${enforcer.version}</version>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>3.1.1</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>