From ea6b5f50fe926c452fe0d4f02523fb79ce877c6d Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Mon, 18 Apr 2022 21:20:59 +0200
Subject: [PATCH] Import aQute.bnd packages and remove bnd.lib from pde-feature

---
 org.eclipse.m2e.pde.feature/feature.xml       | 21 -------------------
 .../META-INF/MANIFEST.MF                      |  5 +++--
 org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF   |  2 +-
 org.eclipse.m2e.repository/category.xml       |  6 ++++++
 4 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/org.eclipse.m2e.pde.feature/feature.xml b/org.eclipse.m2e.pde.feature/feature.xml
index 72b86e9e53..021d0c1df8 100644
--- a/org.eclipse.m2e.pde.feature/feature.xml
+++ b/org.eclipse.m2e.pde.feature/feature.xml
@@ -25,27 +25,6 @@
       <import plugin="org.eclipse.jface"/>
    </requires>
 
-   <plugin
-         id="biz.aQute.bnd.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="biz.aQute.bndlib"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.osgi.service.repository"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.m2e.pde.target"
          download-size="0"
diff --git a/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF
index 2b804e3910..9365b9167a 100644
--- a/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF
@@ -8,14 +8,15 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.19.0",
  org.eclipse.pde.ui;bundle-version="3.12.0",
  org.eclipse.equinox.frameworkadmin;bundle-version="2.1.400",
- biz.aQute.bndlib;bundle-version="5.1.2",
  org.eclipse.m2e.maven.runtime,
  org.eclipse.m2e.core,
  org.eclipse.core.resources
 Export-Package: org.eclipse.m2e.pde.target;x-friends:="org.eclipse.m2e.pde.ui"
 Bundle-Activator: org.eclipse.m2e.pde.target.Activator
 Bundle-ActivationPolicy: lazy
-Import-Package: org.apache.commons.codec.digest;version="1.14.0",
+Import-Package: aQute.bnd.osgi;version="[5.0.0,6.0.0)",
+ aQute.bnd.version;version="[2.0.0,3.0.0)",
+ org.apache.commons.codec.digest;version="1.14.0",
  org.apache.commons.io;version="2.6.0",
  org.apache.commons.io.output;version="2.8.0",
  org.slf4j
diff --git a/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF
index 0071083a58..bd854b5a9a 100644
--- a/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.19.0",
  org.eclipse.jface,
  org.eclipse.pde.ui;bundle-version="3.12.0",
  org.eclipse.equinox.frameworkadmin;bundle-version="2.1.400",
- biz.aQute.bndlib;bundle-version="5.1.2",
  org.eclipse.m2e.maven.runtime,
  org.eclipse.m2e.core,
  org.eclipse.m2e.pde.target,
@@ -22,3 +21,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.19.0",
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.m2e.pde.ui.Activator
 Bundle-Vendor: Eclipse.org - m2e
+Import-Package: aQute.bnd.osgi;version="[5.0.0,6.0.0)"
diff --git a/org.eclipse.m2e.repository/category.xml b/org.eclipse.m2e.repository/category.xml
index e66ae680c5..780e013c52 100644
--- a/org.eclipse.m2e.repository/category.xml
+++ b/org.eclipse.m2e.repository/category.xml
@@ -18,6 +18,12 @@
    <feature id="org.eclipse.m2e.sdk.feature">
       <category name="m2e"/>
    </feature>
+   <bundle id="biz.aQute.bnd.util"/>
+   <bundle id="biz.aQute.bnd.util.source"/>
+   <bundle id="biz.aQute.bndlib"/>
+   <bundle id="biz.aQute.bndlib.source"/>
+   <bundle id="org.osgi.service.repository"/>
+   <bundle id="org.osgi.service.repository.source"/>
    <category-def name="m2e" label="Maven Integration for Eclipse"/>
    <repository-reference location="https://download.eclipse.org/wildwebdeveloper/releases/0.13.5/" enabled="true" />
    <repository-reference location="https://download.eclipse.org/lsp4e/releases/0.20.5/" enabled="true" />