releng: Add missing javax.xml dependency for staging target

This fixes the missing javax.xml dependency for org.apache.xerces.
javax.xml is no longer packaged with the Eclipse RCP features but
apache.xerces still depend on it (for XML editor, etc).
If Orbit updates the dependency then we'll be able to remove it but
it might not be worth the effort at this time.

See also
https://bugs.eclipse.org/bugs/show_bug.cgi?id=467028

Change-Id: I9c1fa21efb5fa992464cae2af08641c80dde23f3
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/90886
Reviewed-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

diff --git a/rcp/org.eclipse.tracecompass.rcp/feature.xml b/rcp/org.eclipse.tracecompass.rcp/feature.xml
index bb148a2c6dc1093c17826abf788549c383338255..d2a07c37e40bf31e8cc92e2f8c1db8b1c19a6700 100644 (file)
--- a/rcp/org.eclipse.tracecompass.rcp/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/feature.xml
@@ -28,6 +28,12 @@
       <import feature="org.eclipse.tracecompass.tmf" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.platform" version="0.0.0" match="greaterOrEqual"/>
    </requires>
+   <plugin
+         id="javax.xml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.json"

diff --git a/rcp/org.eclipse.tracecompass.rcp/pom.xml b/rcp/org.eclipse.tracecompass.rcp/pom.xml
index b6c3d61f636f7ad229c2f19ee51b2fb88e17d877..da476d9833394aba08442583c95a862b8e6e24ff 100644 (file)
--- a/rcp/org.eclipse.tracecompass.rcp/pom.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/pom.xml
@@ -36,6 +36,7 @@
             </goals>
             <configuration>
               <excludes>
+                <plugin id="javax.xml"/>
                 <plugin id="org.apache.commons.compress"/>
                 <plugin id="org.apache.commons.lang3"/>
                 <plugin id="org.apache.xerces"/>