Upgrade Aries Proxy 1.0.4 -> 1.0.5

[controller.git] / karaf / karaf-parent / pom.xml

diff --git a/karaf/karaf-parent/pom.xml b/karaf/karaf-parent/pom.xml
index baf67302e0d49f68affda9850d15cd6910177970..433ae823ac0c5d9c87c88366d4443f7f01925946 100644 (file)
--- a/karaf/karaf-parent/pom.xml
+++ b/karaf/karaf-parent/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -21,8 +21,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <packaging>pom</packaging>
 
   <properties>
-    <branding.version>1.1.0-SNAPSHOT</branding.version>
-    <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
+    <branding.version>1.3.0-SNAPSHOT</branding.version>
+    <karaf.resources.version>1.7.0-SNAPSHOT</karaf.resources.version>
+    <karaf.localFeature>standard</karaf.localFeature>
+    <!--  Karaf Maven plugin 3.023 reinstalls already installed
+          boot features to container, which could be observed
+          in huge logs and seems like loop in build, even if it
+          is not.
+     -->
+    <karaf.maven.version>3.0.1</karaf.maven.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -42,11 +49,31 @@ 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>
   </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>
+    </dependency>
+    <!-- karaf region dependency -->
+    <dependency>
+      <groupId>org.apache.karaf.region</groupId>
+      <artifactId>org.apache.karaf.region.persist</artifactId>
+      <version>${karaf.version}</version>
+      <scope>runtime</scope>
+    </dependency>
     <!-- ODL Branding -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -61,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>
@@ -170,7 +205,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <plugin>
           <groupId>org.apache.karaf.tooling</groupId>
           <artifactId>karaf-maven-plugin</artifactId>
-          <version>${karaf.version}</version>
+          <version>${karaf.maven.version}</version>
           <extensions>true</extensions>
           <configuration>
             <!-- no startupFeatures -->
@@ -286,6 +321,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>
@@ -310,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>