From 83f09f72d1d308311ea553d90a9b495a2c5ada4f Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Mon, 20 Nov 2023 13:54:07 -0500
Subject: [PATCH] Ensure correct version of javax.activation and JAXB end up in
 final repo

---
 debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF | 4 ++--
 releng/org.eclipse.cdt.repo/category.xml                     | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF
index 8bde0fc5599..e5dee32c617 100644
--- a/debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.application/META-INF/MANIFEST.MF
@@ -22,8 +22,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.cdt.debug.core,
  org.eclipse.ui.workbench,
  org.eclipse.orbit.xml-apis-ext,
- jakarta.activation-api,
- jakarta.xml.bind-api
+ jakarta.activation-api;bundle-version="[1.2.2,2.0.0)",
+ jakarta.xml.bind-api;bundle-version="[2.3.3,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml
index cc764e9183c..9695f878a2e 100644
--- a/releng/org.eclipse.cdt.repo/category.xml
+++ b/releng/org.eclipse.cdt.repo/category.xml
@@ -185,6 +185,9 @@
    <bundle id="org.eclipse.cdt.remote.core" version="0.0.0"/>
    <bundle id="org.eclipse.cdt.remote.core.source" version="0.0.0"/>
    <bundle id="com.sun.xml.bind" version="0.0.0"/>
+   <bundle id="org.eclipse.orbit.xml-apis-ext" version="0.0.0"/>
+   <bundle id="jakarta.activation-api" version="1.2.2"/>
+   <bundle id="jakarta.xml.bind-api" version="2.3.3"/>
    <bundle id="com.google.gson" version="0.0.0"/>
    <bundle id="org.freemarker.freemarker" version="2.3.32.stable"/>
    <bundle id="org.yaml.snakeyaml" version="0.0.0"/>