X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=karaf%2Fkaraf-parent%2Fpom.xml;h=433ae823ac0c5d9c87c88366d4443f7f01925946;hb=11e16facd8ba32e307d634b6da13160d57597cce;hp=64616ae569ab939c2f87714e3131e80db99c1968;hpb=2d0262de6e6371cd2d4875c598cd30fe891a76dc;p=controller.git

diff --git a/karaf/karaf-parent/pom.xml b/karaf/karaf-parent/pom.xml
index 64616ae569..433ae823ac 100644
--- a/karaf/karaf-parent/pom.xml
+++ b/karaf/karaf-parent/pom.xml
@@ -49,6 +49,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
           </exclusion>
+          <!-- We provide a newer version of Aries Proxy -->
+          <exclusion>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy.impl</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
     </dependencies>
@@ -61,7 +66,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${karaf.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
-      <scope>runtime</scope>
     </dependency>
     <!-- karaf region dependency -->
     <dependency>
@@ -84,6 +88,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>opendaylight-karaf-resources</artifactId>
       <version>${karaf.resources.version}</version>
     </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>
   </dependencies>
   <build>
     <pluginManagement>
@@ -350,6 +362,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                       <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>