Resolve a clash between two implementations of org.w3c.dom

[simantics/platform.git] / bundles / org.apache.batik / META-INF / MANIFEST.MF

diff --git a/bundles/org.apache.batik/META-INF/MANIFEST.MF b/bundles/org.apache.batik/META-INF/MANIFEST.MF
index b8a5093e80cd8afc8639aabfd6fcd0a24a7353b9..22d86a06df08db8ae7248e550a6484b1171ea151 100644 (file)
--- a/bundles/org.apache.batik/META-INF/MANIFEST.MF
+++ b/bundles/org.apache.batik/META-INF/MANIFEST.MF
@@ -3,11 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Batik
 Bundle-SymbolicName: org.apache.batik;singleton:=true
 Bundle-Version: 1.8.0.qualifier
-Bundle-Activator: org.apache.batik.Activator
-Require-Bundle: org.eclipse.ui,\r
- org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
 Export-Package: java_cup.runtime,
  org.apache.avalon.framework,
  org.apache.avalon.framework.activity,
@@ -98,12 +94,17 @@ Export-Package: java_cup.runtime,
  org.apache.fop,
  org.apache.fop.accessibility,
  org.apache.fop.apps,
+ org.apache.fop.apps.io,
+ org.apache.fop.complexscripts.bidi,
  org.apache.fop.complexscripts.fonts,
+ org.apache.fop.complexscripts.util,
+ org.apache.fop.events,
  org.apache.fop.fo,
  org.apache.fop.fonts,
  org.apache.fop.fonts.apps,
  org.apache.fop.fonts.autodetect,
  org.apache.fop.fonts.base14,
+ org.apache.fop.fonts.cff,
  org.apache.fop.fonts.substitute,
  org.apache.fop.fonts.truetype,
  org.apache.fop.fonts.type1,
@@ -111,13 +112,18 @@ Export-Package: java_cup.runtime,
  org.apache.fop.pdf,
  org.apache.fop.pdf.xref,
  org.apache.fop.render,
+ org.apache.fop.render.gradient,
  org.apache.fop.render.intermediate,
  org.apache.fop.render.pdf,
  org.apache.fop.render.pdf.extensions,
  org.apache.fop.render.ps,
  org.apache.fop.render.ps.extensions,
  org.apache.fop.render.ps.fonts,
+ org.apache.fop.render.ps.svg,
  org.apache.fop.svg,
+ org.apache.fop.svg.font,
+ org.apache.fop.svg.text,
+ org.apache.fop.traits,
  org.apache.fop.util,
  org.apache.html.dom,
  org.apache.regexp,
@@ -245,7 +251,15 @@ Export-Package: java_cup.runtime,
  org.mozilla.javascript.tools.jsc,
  org.mozilla.javascript.tools.shell,
  org.mozilla.javascript.xml,
- org.mozilla.javascript.xmlimpl
+ org.mozilla.javascript.xmlimpl,
+ org.w3c.css.sac,
+ org.w3c.css.sac.helpers,
+ org.w3c.dom,
+ org.w3c.dom.events,
+ org.w3c.dom.html,
+ org.w3c.dom.ls,
+ org.w3c.dom.smil,
+ org.w3c.dom.svg
 Bundle-ClassPath: lib/batik-awt-util-1.8.jar,
  lib/batik-dom-1.8.jar,
  lib/batik-ext-1.8.jar,
@@ -269,33 +283,6 @@ Bundle-ClassPath: lib/batik-awt-util-1.8.jar,
  lib/js.jar,
  lib/xalan-2.7.0.jar,
  lib/xerces_2_5_0.jar,
- lib/fop-transcoder-allinone-svn-trunk.jar
-Import-Package: javax.xml,
- javax.xml.datatype,
- javax.xml.namespace,
- javax.xml.parsers,
- javax.xml.transform,
- javax.xml.transform.dom,
- javax.xml.transform.sax,
- javax.xml.transform.stream,
- javax.xml.validation,
- javax.xml.xpath,
- org.w3c.css.sac,
- org.w3c.css.sac.helpers,
- org.w3c.dom,
- org.w3c.dom.bootstrap,
- org.w3c.dom.css,
- org.w3c.dom.events,
- org.w3c.dom.html,
- org.w3c.dom.ls,
- org.w3c.dom.ranges,
- org.w3c.dom.smil,
- org.w3c.dom.stylesheets,
- org.w3c.dom.svg,
- org.w3c.dom.traversal,
- org.w3c.dom.views,
- org.w3c.dom.xpath,
- org.xml.sax,
- org.xml.sax.ext,
- org.xml.sax.helpers,
- org.apache.xmlcommons
+ lib/fop-transcoder-allinone-svn-trunk.jar,
+ lib/xml-apis-ext-1.3.04.jar
+Require-Bundle: javax.xml;bundle-version="1.3.4"