Another attempt at Batik fixes.

ControlSystemStudio · Jul 22, 2020 · 616b5f8 · 616b5f8
1 parent 69b7ca0
commit 616b5f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/applications/opibuilder/opibuilder-plugins/org.csstudio.swt.widgets/META-INF/MANIFEST.MF b/applications/opibuilder/opibuilder-plugins/org.csstudio.swt.widgets/META-INF/MANIFEST.MF
@@ -16,19 +16,10 @@ Require-Bundle: org.eclipse.ui;resolution:=optional,
  org.apache.commons.lang,
  org.csstudio.ui.util;resolution:=optional,
  com.google.guava,
- org.apache.xmlgraphics.batik-bridge;bundle-version="[1.10.0,1.11.0)",
- org.apache.xmlgraphics.batik-dom;bundle-version="[1.10.0,1.11.0)",
- org.apache.xmlgraphics.batik-svg-dom;bundle-version="[1.10.0,1.11.0)",
- org.apache.xmlgraphics.batik-transcoder;bundle-version="[1.10.0,1.11.0)",
- org.apache.batik.css;bundle-version="[1.10.0,1.11.0)",
- org.apache.xmlgraphics.batik-xml;bundle-version="[1.10.0,1.11.0)",
- org.apache.xmlgraphics.batik-awt-util;bundle-version="[1.10.0,1.11.0)",
- org.apache.xmlgraphics.batik-anim;bundle-version="[1.10.0,1.11.0)",
- org.apache.xmlgraphics.batik-gvt;bundle-version="[1.10.0,1.11.0)",
- org.apache.xmlgraphics.batik-script;bundle-version="[1.10.0,1.11.0)",
  org.w3c.dom.svg;bundle-version="1.1.0",
  org.w3c.dom.events;bundle-version="3.0.0",
- org.apache.xmlgraphics.batik-codec;bundle-version="1.10.0"
+ org.apache.xmlgraphics.batik-anim;bundle-version="[1.10.0,1.11.0]",
+ org.apache.batik.util;bundle-version="1.10.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.csstudio.swt.widgets.datadefinition,

diff --git a/core/utility/utility-plugins/org.csstudio.utility.batik/META-INF/MANIFEST.MF b/core/utility/utility-plugins/org.csstudio.utility.batik/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.csstudio.utility.batik;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: CS-Studio <[email protected]>
 Bundle-Activator: org.csstudio.utility.batik.Activator
-Require-Bundle: org.w3c.dom.svg, 
+Require-Bundle: org.w3c.dom.svg,
  org.eclipse.core.runtime,
  org.eclipse.ui;resolution:=optional,
  org.apache.commons.lang,
@@ -22,7 +22,8 @@ Require-Bundle: org.w3c.dom.svg,
  org.apache.xmlgraphics.batik-script;bundle-version="[1.10.0,1.11.0)",
  org.apache.xmlgraphics.batik-ext;bundle-version="[1.10.0,1.11.0)",
  org.apache.xmlgraphics.batik-parser;bundle-version="[1.10.0,1.11.0)",
- org.apache.batik.util;bundle-version="[1.10.0,1.11.0)"
+ org.apache.batik.util;bundle-version="[1.10.0,1.11.0)",
+ org.apache.xmlgraphics.batik-codec;bundle-version="[1.10.0,1.11.0)"
 Export-Package: org.csstudio.utility.batik
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11