X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=karaf%2Fkaraf-parent%2Fpom.xml;h=30a8ed6a7d4e6c55b9b5cc60f6a70c728252095b;hp=e22953f96210111a0428bbdb959abe15cf53ef25;hb=1c9493abccb67110fdac2613745bc77a8a6c329c;hpb=d732c8b8e2fff180545918192dabd376748a9130

diff --git a/karaf/karaf-parent/pom.xml b/karaf/karaf-parent/pom.xml
index e22953f962..30a8ed6a7d 100644
--- a/karaf/karaf-parent/pom.xml
+++ b/karaf/karaf-parent/pom.xml
@@ -30,6 +30,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           is not.
      -->
     <karaf.maven.version>3.0.1</karaf.maven.version>
+    <karaf.archiveTarGz>true</karaf.archiveTarGz>
+    <karaf.archiveZip>true</karaf.archiveZip>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -259,6 +261,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
               <goals>
                 <goal>instance-create-archive</goal>
               </goals>
+              <configuration>
+                <archiveTarGz>${karaf.archiveTarGz}</archiveTarGz>
+                <archiveZip>${karaf.archiveZip}</archiveZip>
+              </configuration>
             </execution>
           </executions>
         </plugin>
@@ -386,11 +392,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                            value="# BUG-5917: javax.xml.transform.TransformerFactory=">
                     <include name="system.properties"/>
                   </replace>
+                  <!-- Karaf 3.0.6 ships the Xalan 2.7.2_2 ServiceMix bundle -->
                   <jar destfile="${project.build.directory}/assembly/lib/endorsed/odl-org.apache.servicemix.bundles.xalan-2.7.2_2_odl.jar">
                     <zipfileset src="${project.build.directory}/assembly/lib/endorsed/org.apache.servicemix.bundles.xalan-2.7.2_2.jar"
                                 excludes="META-INF/services/javax.xml.*" erroronmissingarchive="false"/>
                   </jar>
                   <delete file="${project.build.directory}/assembly/lib/endorsed/org.apache.servicemix.bundles.xalan-2.7.2_2.jar" />
+                  <!-- Karaf 3.0.7 ships the Xalan 2.7.2_3 ServiceMix bundle -->
+                  <jar destfile="${project.build.directory}/assembly/lib/endorsed/odl-org.apache.servicemix.bundles.xalan-2.7.2_3_odl.jar">
+                    <zipfileset src="${project.build.directory}/assembly/lib/endorsed/org.apache.servicemix.bundles.xalan-2.7.2_3.jar"
+                                excludes="META-INF/services/javax.xml.*" erroronmissingarchive="false"/>
+                  </jar>
+                  <delete file="${project.build.directory}/assembly/lib/endorsed/org.apache.servicemix.bundles.xalan-2.7.2_3.jar" />
 
                 </tasks>
               </configuration>