BUG-5917: use JVM-internal TransformerFactoryImpl 68/39368/5
authorRobert Varga <rovarga@cisco.com>
Tue, 24 May 2016 17:15:02 +0000 (19:15 +0200)
committerRobert Varga <rovarga@cisco.com>
Wed, 25 May 2016 10:29:48 +0000 (12:29 +0200)
This overrides karaf-3.0.6 to enable our XML components to work.

Change-Id: I1d070f9045f57ec15b1d1613a8b83e7a48a9c91e
Signed-off-by: Robert Varga <rovarga@cisco.com>
karaf/karaf-parent/pom.xml

index 3ff6930096e6f3e5dfe55f7e0637b92c6876ce44..70862896af4818d850cc3936b424ca938a0b7e36 100644 (file)
@@ -376,6 +376,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                            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>