diff --git a/bundles/org.eclipse.swt.tools.spies/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.tools.spies/META-INF/MANIFEST.MF index cf3a8d15e72..4593e631629 100644 --- a/bundles/org.eclipse.swt.tools.spies/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt.tools.spies/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Export-Package: org.eclipse.swt.tools.internal, Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0", org.eclipse.swt.tools.base;bundle-version="3.106.0", org.eclipse.e4.ui.model.workbench;bundle-version="2.1.400", org.eclipse.swt;bundle-version="3.119.0", diff --git a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF index a7fd869f0e4..3adef453a2e 100644 --- a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Export-Package: org.eclipse.swt.tools.internal; x-internal:=true Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0", org.eclipse.core.resources;bundle-version="3.4.0", org.eclipse.jdt.core;bundle-version="3.4.0", org.eclipse.ui;bundle-version="3.4.0", diff --git a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java index d923b2367af..df6f5c332e1 100644 --- a/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java +++ b/bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java @@ -17,8 +17,6 @@ import java.util.*; import java.util.Map.*; -import javax.xml.parsers.*; - import org.w3c.dom.*; import org.xml.sax.*; @@ -948,7 +946,9 @@ public void setSelectorEnum(String selectorEnumName) { Document getDocument(String xmlPath) { try (InputStream is = createInputStream(xmlPath)) { if (is != null) { - return DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(is)); + @SuppressWarnings("restriction") + Document d = org.eclipse.core.internal.runtime.XmlProcessorFactory.parseWithErrorOnDOCTYPE(new InputSource(is)); + return d; } } catch (Exception e) { //ignored