Add recent changes from karaf-parent pom to the distribution pom

[integration/distribution.git] / distribution-karaf / pom.xml

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 9f5aeba7b37fd47480fcff93715520e3287fbf48..d48c9a2a57fde6e37715ac16d81f88a5eeee426a 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -32,6 +32,11 @@
           <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>
     <!-- scope is runtime so the feature repo is listed in the features
@@ -137,6 +142,15 @@
         </exclusion>
       </exclusions>
     </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>
@@ -250,7 +264,12 @@
         <artifactId>karaf-maven-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <!-- no startupFeatures -->
+          <startupFeatures>
+            <!-- For some reason, the eventadmin bundle works fine when installed via the
+                 startup.properties but doesn't work properly when installed via the
+                 boot features.  -->
+            <feature>eventadmin</feature>
+          </startupFeatures>
           <bootFeatures>
             <feature>standard</feature>
           </bootFeatures>
@@ -347,6 +366,24 @@
               <excludeTransitive>true</excludeTransitive>
             </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>
+                <includeArtifactIds>org.apache.aries.proxy.impl</includeArtifactIds>
+                <overWriteReleases>false</overWriteReleases>
+                <overWriteSnapshots>true</overWriteSnapshots>
+                <overWriteIfNewer>true</overWriteIfNewer>
+                <useRepositoryLayout>true</useRepositoryLayout>
+                <addParentPoms>true</addParentPoms>
+                <copyPom>true</copyPom>
+              </configuration>
+            </execution>
+
         </executions>
       </plugin>
       <plugin>
@@ -371,6 +408,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>