From 4ecb98269ee4e69bf27c6540a0ccd69999784789 Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Tue, 13 Aug 2024 16:17:35 +0200
Subject: [PATCH] Avoid using the bundle name
 org.apache.commons.commons-logging

- Rely purely on package imports of org.apache.commons.logging and
include version 1.2.0 in the range.

https://github.com/eclipse-orbit/orbit-simrel/issues/40
---
 .../org.eclipse.wst.xsl.jaxp.debug/META-INF/MANIFEST.MF       | 4 ++--
 xsl/bundles/org.eclipse.wst.xsl.xalan/META-INF/MANIFEST.MF    | 1 +
 xsl/features/org.eclipse.wst.xsl.feature/feature.xml          | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xsl/bundles/org.eclipse.wst.xsl.jaxp.debug/META-INF/MANIFEST.MF b/xsl/bundles/org.eclipse.wst.xsl.jaxp.debug/META-INF/MANIFEST.MF
index e50c90241b..de41856d14 100644
--- a/xsl/bundles/org.eclipse.wst.xsl.jaxp.debug/META-INF/MANIFEST.MF
+++ b/xsl/bundles/org.eclipse.wst.xsl.jaxp.debug/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@ Bundle-SymbolicName: org.eclipse.wst.xsl.jaxp.debug;singleton:=true
 Bundle-Version: 1.1.200.qualifier
 Bundle-Vendor: %vendorName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.apache.commons.commons-logging;bundle-version="1.0.4";visibility:=reexport,
- org.apache.xml.resolver;bundle-version="1.1.0";resolution:=optional
+Require-Bundle: org.apache.xml.resolver;bundle-version="1.1.0";resolution:=optional
 Export-Package: org.eclipse.wst.xsl.jaxp.debug.debugger,
  org.eclipse.wst.xsl.jaxp.debug.invoker,
  org.eclipse.wst.xsl.jaxp.debug.invoker.internal;x-internal:=true
+Import-Package: org.apache.commons.logging;version="[1.2.0,2.0.0)"
 Bundle-Localization: plugin
diff --git a/xsl/bundles/org.eclipse.wst.xsl.xalan/META-INF/MANIFEST.MF b/xsl/bundles/org.eclipse.wst.xsl.xalan/META-INF/MANIFEST.MF
index 4b3fda5d85..f5477bb511 100644
--- a/xsl/bundles/org.eclipse.wst.xsl.xalan/META-INF/MANIFEST.MF
+++ b/xsl/bundles/org.eclipse.wst.xsl.xalan/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@ Export-Package: org.eclipse.wst.xsl.xalan.debugger;
    org.apache.xalan.trace,
    javax.xml.transform,
    org.apache.xalan.templates"
+Import-Package: org.apache.commons.logging;version="[1.2.0,2.0.0)"
 Require-Bundle: org.apache.xalan;bundle-version="[2.7.0,2.8.0)",
  org.apache.xml.serializer;bundle-version="[2.7.0,2.8.0)",
  org.eclipse.wst.xsl.jaxp.debug;bundle-version="[1.0.0,2.0.0)";resolution:=optional
diff --git a/xsl/features/org.eclipse.wst.xsl.feature/feature.xml b/xsl/features/org.eclipse.wst.xsl.feature/feature.xml
index e1a5e2f9ac..328ea10480 100644
--- a/xsl/features/org.eclipse.wst.xsl.feature/feature.xml
+++ b/xsl/features/org.eclipse.wst.xsl.feature/feature.xml
@@ -36,7 +36,6 @@
       <import feature="org.eclipse.wst.xml.xpath2.processor.feature" version="0.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.wst.xml_ui.feature" version="3.3.0" match="greaterOrEqual"/>
       <import plugin="org.apache.xalan" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.apache.commons.commons-logging" version="1.0.4" match="greaterOrEqual"/>
       <import plugin="org.apache.xml.serializer" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.apache.bcel" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="java_cup-runtime" version="0.0.0" match="greaterOrEqual"/>