From ad46b230efe283fd42869b0a6704eacc627a45f3 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Tue, 17 Sep 2024 23:50:18 +0200 Subject: [PATCH] [E4 Xpath] Import org.apache.commons.jxpath packages instead of requiring the bundle 'org.apache.commons.jxpath'. This allows interested parties to supply alternative providers than the old and problematic 'org.apache.commons.jxpath'. Helps for https://github.com/eclipse-platform/eclipse.platform.ui/issues/423 --- bundles/org.eclipse.e4.emf.xpath/META-INF/MANIFEST.MF | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.e4.emf.xpath/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.emf.xpath/META-INF/MANIFEST.MF index 34efac90f62..1290213bb2e 100644 --- a/bundles/org.eclipse.e4.emf.xpath/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.emf.xpath/META-INF/MANIFEST.MF @@ -4,11 +4,15 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.e4.emf.xpath Bundle-Version: 0.4.300.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.apache.commons.jxpath;bundle-version="1.2.0", - org.eclipse.emf.ecore;bundle-version="2.35.0", +Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.35.0", org.eclipse.core.runtime;bundle-version="3.29.0" Export-Package: org.eclipse.e4.emf.internal.xpath;x-internal:=true, org.eclipse.e4.emf.internal.xpath.helper;x-friends:="org.eclipse.e4.emf.xpath.test,org.eclipse.e4.ui.model.workbench,org.eclipse.e4.ui.workbench", org.eclipse.e4.emf.xpath +Import-Package: org.apache.commons.jxpath;version="[1.3.0,2.0.0)", + org.apache.commons.jxpath.ri;version="[1.3.0,2.0.0)", + org.apache.commons.jxpath.ri.compiler;version="[1.3.0,2.0.0)", + org.apache.commons.jxpath.ri.model;version="[1.3.0,2.0.0)", + org.apache.commons.jxpath.util;version="[1.3.0,2.0.0)" Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.e4.emf.xpath