X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=karaf%2Fopendaylight-karaf%2Fpom.xml;h=a34361970dd19101b4ac773a6a43500910247c59;hp=e0ea4c0edffb3758a87e5d33b0576fbd7a58b54b;hb=8fefdf8981eaef2a8192238699011ac662152a1c;hpb=488cc48063a540a046084b398c72e5c58d2c7288

diff --git a/karaf/opendaylight-karaf/pom.xml b/karaf/opendaylight-karaf/pom.xml
index e0ea4c0edf..a34361970d 100644
--- a/karaf/opendaylight-karaf/pom.xml
+++ b/karaf/opendaylight-karaf/pom.xml
@@ -4,14 +4,11 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath>../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <artifactId>distribution.opendaylight-karaf</artifactId>
   <packaging>pom</packaging>
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
 
   <dependencies>
     <dependency>
@@ -46,34 +43,20 @@
       <type>xml</type>
     </dependency>
 
+    <!-- Aries Proxy 1.0.5 contains important bug fixes -->
+    <!-- Once we upgrade to a version of Karaf which has at least 1.0.5, this can be removed -->
+    <dependency>
+      <groupId>org.apache.aries.proxy</groupId>
+      <artifactId>org.apache.aries.proxy.impl</artifactId>
+      <version>1.0.5</version>
+    </dependency>
+
     <!--
           controller provided features:
           Note: Nothing should go here that is not locked
           down with testing... ie, no broken feature repos
     -->
 
-    <!-- AD-SAL Related Features -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-base</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-adsal</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-nsf</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
     <!-- MD-SAL Related Features -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -91,36 +74,27 @@
           <scope>runtime</scope>
       </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-flow</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-restconf</artifactId>
-      <version>1.2.0-SNAPSHOT</version>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>features-mdsal</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-neutron</artifactId>
-      <version>${networkconfig.neutron.version}</version>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>features-mdsal-model</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+
     <!-- Netconf connector features. When this is included, users can test the netconf connector using netconf-testtool -->
-    <dependency>
+<!--     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-netconf-connector</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
-    </dependency>
-
+    </dependency> -->
   </dependencies>
 
   <build>
@@ -209,7 +183,6 @@
       <plugin>
         <groupId>org.apache.karaf.tooling</groupId>
         <artifactId>karaf-maven-plugin</artifactId>
-        <version>${karaf.version}</version>
         <extensions>true</extensions>
         <configuration>
           <!-- no startupFeatures -->
@@ -244,7 +217,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.6</version>
         <executions>
           <execution>
             <id>copy</id>
@@ -288,6 +260,23 @@
              <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>
+                <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>
@@ -312,6 +301,12 @@
                           <include name="shell"/>
                         </fileset>
                     </chmod>
+                    <!-- Remove this once Karaf provides a new-enough version of Aries Proxy -->
+                    <replace dir="${project.build.directory}/assembly/etc"
+                             token="org.apache.aries.proxy.impl/1.0.4"
+                             value="org.apache.aries.proxy.impl/1.0.5">
+                      <include name="startup.properties"/>
+                    </replace>
                   </tasks>
                 </configuration>
             </execution>
@@ -320,7 +315,7 @@
     </plugins>
   </build>
   <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>