From: Vratko Polak <vrpolak@cisco.com>
Date: Wed, 25 May 2016 11:23:14 +0000 (+0200)
Subject: Bug 5943: Change default endorsed jars
X-Git-Tag: release/boron~54
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0bb2523b0651e31ad0f03458120d0440a8f176b2;p=integration%2Fdistribution.git

Bug 5943: Change default endorsed jars

Remove overrides for platform factories and neuter Xalan's services.
This is a port of karaf-parent change https://git.opendaylight.org/gerrit/#/c/39368/5

Change-Id: Ie6479ae19c650053ea0c1393585fb25adaa8dd23
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index d48c9a2a..00bfe893 100644
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -414,6 +414,22 @@
                              value="org.apache.aries.proxy.impl/1.0.5">
                       <include name="startup.properties"/>
                     </replace>
+
+                    <!-- BUG-5917, BUG-5943: remove overrides for platform factories and neuter Xalan's services-->
+                    <replace dir="${project.build.directory}/assembly/etc" token="javax.xml.parsers.DocumentBuilderFactory="
+                             value="# BUG-5943: javax.xml.parsers.DocumentBuilderFactory=">
+                      <include name="system.properties"/>
+                    </replace>
+                    <replace dir="${project.build.directory}/assembly/etc" token="javax.xml.transform.TransformerFactory="
+                             value="# BUG-5917: javax.xml.transform.TransformerFactory=">
+                      <include name="system.properties"/>
+                    </replace>
+                    <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" />
+
                   </tasks>
                 </configuration>
             </execution>