Import the org.apache.commons.logging/io package instead of the bundle

- The latest version of these are named org.apache.commons.common-io and org.apache.commons.common-logging so better to avoid using the bundle name entirely. eclipse-simrel/simrel.build#438
merks · Jul 7, 2024 · 399af13 · 399af13
1 parent c60df3e
commit 399af13
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/plugins/org.eclipse.php.composer.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.php.composer.api/META-INF/MANIFEST.MF
@@ -6,8 +6,7 @@ Bundle-SymbolicName: org.eclipse.php.composer.api
 Bundle-Version: 8.3.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.apache.commons.logging,
- org.apache.httpcomponents.httpclient;bundle-version="4.3.6",
+Require-Bundle: org.apache.httpcomponents.httpclient;bundle-version="4.3.6",
  org.apache.httpcomponents.httpcore;bundle-version="4.3.3",
  com.google.gson;bundle-version="2.2.4",
  org.eclipse.core.net,
@@ -19,3 +18,4 @@ Export-Package: org.eclipse.php.composer.api,
  org.eclipse.php.composer.api.objects,
  org.eclipse.php.composer.api.packages,
  org.eclipse.php.composer.api.repositories
+Import-Package: org.apache.commons.logging
diff --git a/plugins/org.eclipse.php.composer.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.php.composer.core/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.php.debug.core,
  org.eclipse.wst.common.project.facet.core,
- org.apache.commons.logging,
  org.eclipse.php.composer.api,
  org.eclipse.wst.validation,
  org.eclipse.e4.core.di.annotations
@@ -37,6 +36,7 @@ Export-Package:
  org.eclipse.php.composer.core.visitor,
  org.eclipse.php.composer.internal.core.resources,
  org.eclipse.php.composer.internal.core.util
-Import-Package: jakarta.inject
+Import-Package: jakarta.inject,
+ org.apache.commons.logging
 
 
diff --git a/plugins/org.eclipse.php.composer.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.php.composer.ui/META-INF/MANIFEST.MF
@@ -26,7 +26,6 @@ Require-Bundle: org.eclipse.ui.forms,
  org.eclipse.php.composer.api,
  org.eclipse.e4.core.contexts,
  org.eclipse.e4.core.di,
- org.apache.commons.io,
  org.eclipse.equinox.p2.ui.discovery,
  org.eclipse.equinox.p2.discovery,
  org.eclipse.php.server.core,
@@ -61,5 +60,6 @@ Export-Package:
  org.eclipse.php.composer.ui.wizard.importer,
  org.eclipse.php.composer.ui.wizard.project,
  org.eclipse.php.composer.ui.wizard.project.template
-Import-Package: jakarta.inject
+Import-Package: jakarta.inject,
+ org.apache.commons.io
 Bundle-ClassPath: .
diff --git a/plugins/org.eclipse.php.phpunit/META-INF/MANIFEST.MF b/plugins/org.eclipse.php.phpunit/META-INF/MANIFEST.MF
@@ -27,9 +27,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.php.debug.daemon,
  com.google.gson,
  org.eclipse.ui.console,
- org.apache.commons.io,
  org.apache.commons.lang3
 Bundle-ActivationPolicy: lazy
 Eclipse-BundleShape: dir
+Import-Package: org.apache.commons.io
 Bundle-RequiredExecutionEnvironment: JavaSE-17