diff --git a/mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF b/mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
index dc6f5e216e..f4820796fa 100644
--- a/mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
+++ b/mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
@@ -4,9 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.hudson.core;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.apache.commons.io;bundle-version="2.8.0",
- org.apache.httpcomponents.httpcore;bundle-version="4.4.15",
- org.eclipse.core.runtime;bundle-version="0.0.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.emf.ecore;bundle-version="0.0.0",
  org.eclipse.mylyn.builds.core;bundle-version="4.0.0",
  org.eclipse.mylyn.commons.core;bundle-version="4.0.0",
@@ -25,6 +23,7 @@ Import-Package: com.google.gson;version="2.9.1",
  com.sun.xml.bind;version="2.3.3",
  javax.xml.bind;version="2.3.3",
  javax.xml.bind.annotation;version="2.3.3",
+ org.apache.commons.io;version="2.8.0",
  org.apache.http;version="[4.4.4,4.5.0)",
  org.apache.http.client;version="[4.5.2,4.6.0)",
  org.apache.http.client.entity;version="[4.5.2,4.6.0)",
diff --git a/mylyn.commons/org.eclipse.mylyn.commons.sdk.util/META-INF/MANIFEST.MF b/mylyn.commons/org.eclipse.mylyn.commons.sdk.util/META-INF/MANIFEST.MF
index 89e6d7d167..733898c3ed 100644
--- a/mylyn.commons/org.eclipse.mylyn.commons.sdk.util/META-INF/MANIFEST.MF
+++ b/mylyn.commons/org.eclipse.mylyn.commons.sdk.util/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: com.google.gson;bundle-version="2.9.1",
  com.google.guava;bundle-version="0.0.0",
- org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)",
  org.eclipse.core.net;bundle-version="0.0.0",
  org.eclipse.core.resources;bundle-version="0.0.0",
  org.eclipse.core.runtime;bundle-version="0.0.0",
@@ -20,4 +19,5 @@ Require-Bundle: com.google.gson;bundle-version="2.9.1",
  org.eclipse.ui.editors;bundle-version="0.0.0",
  org.junit;bundle-version="4.8.2"
 Export-Package: org.eclipse.mylyn.commons.sdk.util;x-internal:=true
+Import-Package: org.apache.commons.lang.reflect;version="2.6.0"
 Bundle-Vendor: Eclipse Mylyn
diff --git a/mylyn.commons/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF b/mylyn.commons/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF
index f92c1b484b..c585d4aba0 100644
--- a/mylyn.commons/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF
+++ b/mylyn.commons/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.mylyn.commons.ui;singleton:=true
 Automatic-Module-Name: org.eclipse.mylyn.commons.ui
 Bundle-Version: 4.0.0.qualifier
 Require-Bundle: com.google.guava;bundle-version="0.0.0",
- org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
  org.eclipse.mylyn.commons.core;bundle-version="4.0.0",
@@ -21,6 +20,7 @@ Export-Package: org.eclipse.mylyn.commons.ui,
  org.eclipse.mylyn.commons.ui.dialogs,
  org.eclipse.mylyn.commons.ui.wizard,
  org.eclipse.mylyn.internal.commons.ui;x-internal:=true
-Import-Package: org.w3c.dom.css
+Import-Package: org.apache.commons.lang.reflect;version="2.6.0",
+ org.w3c.dom.css
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/mylyn.context/org.eclipse.mylyn.debug.tests/META-INF/MANIFEST.MF b/mylyn.context/org.eclipse.mylyn.debug.tests/META-INF/MANIFEST.MF
index 4ab70d296a..21d6fc00e5 100644
--- a/mylyn.context/org.eclipse.mylyn.debug.tests/META-INF/MANIFEST.MF
+++ b/mylyn.context/org.eclipse.mylyn.debug.tests/META-INF/MANIFEST.MF
@@ -4,8 +4,7 @@ Bundle-Name: Mylyn Context Tests
 Bundle-SymbolicName: org.eclipse.mylyn.debug.tests;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: Eclipse Mylyn
-Require-Bundle: org.apache.commons.io;bundle-version="0.0.0",
- org.eclipse.core.resources;bundle-version="0.0.0",
+Require-Bundle: org.eclipse.core.resources;bundle-version="0.0.0",
  org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.debug.core;bundle-version="0.0.0",
  org.eclipse.jdt.core;bundle-version="0.0.0",
@@ -23,3 +22,4 @@ Require-Bundle: org.apache.commons.io;bundle-version="0.0.0",
  org.junit;bundle-version="4.8.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.eclipse.mylyn.internal.debug.ui;x-internal:=true
+Import-Package: org.apache.commons.io;version="2.8.0"
diff --git a/mylyn.context/org.eclipse.mylyn.debug.ui/META-INF/MANIFEST.MF b/mylyn.context/org.eclipse.mylyn.debug.ui/META-INF/MANIFEST.MF
index 04f798f22c..606f563b22 100644
--- a/mylyn.context/org.eclipse.mylyn.debug.ui/META-INF/MANIFEST.MF
+++ b/mylyn.context/org.eclipse.mylyn.debug.ui/META-INF/MANIFEST.MF
@@ -5,8 +5,7 @@ Bundle-SymbolicName: org.eclipse.mylyn.debug.ui;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.debug.ui.DebugUiPlugin
 Bundle-Localization: plugin
-Require-Bundle: org.apache.commons.io;bundle-version="0.0.0",
- org.eclipse.core.runtime;bundle-version="0.0.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.core.resources;bundle-version="0.0.0",
  org.eclipse.debug.core;bundle-version="0.0.0",
  org.eclipse.debug.ui;bundle-version="0.0.0",
@@ -27,3 +26,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ClassPath: .
 Export-Package: org.eclipse.mylyn.internal.debug.ui;x-internal:=true,
  org.eclipse.mylyn.internal.debug.ui.cnf;x-internal:=true
+Import-Package: org.apache.commons.io;version="2.8.0"
diff --git a/mylyn.context/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF b/mylyn.context/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
index 9d675632da..341d8d77f1 100644
--- a/mylyn.context/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
+++ b/mylyn.context/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
@@ -4,8 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.resources.ui;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.mylyn.internal.resources.ui.ResourcesUiBridgePlugin
-Require-Bundle: org.apache.ant;bundle-version="1.7.0",
- org.eclipse.compare;bundle-version="0.0.0",
+Require-Bundle: org.eclipse.compare;bundle-version="0.0.0",
  org.eclipse.core.expressions;bundle-version="0.0.0",
  org.eclipse.core.resources;bundle-version="0.0.0",
  org.eclipse.core.runtime;bundle-version="0.0.0",
@@ -24,5 +23,6 @@ Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.mylyn.internal.resources.ui;x-internal:=true,
  org.eclipse.mylyn.internal.resources.ui.preferences;x-internal:=true,
  org.eclipse.mylyn.resources.ui
+Import-Package: org.apache.tools.ant.types.selectors;version="1.10.12"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Localization: plugin
diff --git a/mylyn.reviews/org.eclipse.mylyn.reviews.tests/META-INF/MANIFEST.MF b/mylyn.reviews/org.eclipse.mylyn.reviews.tests/META-INF/MANIFEST.MF
index e8b6cf7eb4..095379904e 100644
--- a/mylyn.reviews/org.eclipse.mylyn.reviews.tests/META-INF/MANIFEST.MF
+++ b/mylyn.reviews/org.eclipse.mylyn.reviews.tests/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@ Export-Package: org.eclipse.mylyn.reviews.spi.edit.remote;x-internal:=true,
  org.eclipse.mylyn.reviews.tests;x-internal:=true,
  org.eclipse.mylyn.reviews.tests.ui;x-internal:=true,
  org.eclipse.mylyn.reviews.tests.util;x-internal:=true
-Import-Package: org.eclipse.compare.internal
-Require-Bundle: org.apache.commons.io;bundle-version="2.8.0",
- org.apache.commons.lang;bundle-version="2.6.0",
+Import-Package: org.apache.commons.io;version="2.8.0",
+ org.apache.commons.lang;version="2.6.0"
+Require-Bundle: org.eclipse.compare;bundle-version="0.0.0",
  org.eclipse.core.resources;bundle-version="0.0.0",
  org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.emf.edit;bundle-version="0.0.0",
diff --git a/mylyn.tasks/connectors/bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/META-INF/MANIFEST.MF b/mylyn.tasks/connectors/bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/META-INF/MANIFEST.MF
index c5c8283f44..ce60fbc158 100644
--- a/mylyn.tasks/connectors/bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/META-INF/MANIFEST.MF
+++ b/mylyn.tasks/connectors/bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-Vendor: Eclipse Mylyn
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: com.google.gson;bundle-version="0.0.0",
  com.google.guava;bundle-version="0.0.0",
- org.apache.commons.io;bundle-version="0.0.0",
  org.hamcrest;bundle-version="0.0.0",
  org.hamcrest.library;bundle-version="0.0.0",
  org.eclipse.core.runtime;bundle-version="0.0.0",
@@ -22,3 +21,4 @@ Require-Bundle: com.google.gson;bundle-version="0.0.0",
  org.junit;bundle-version="4.8.2"
 Export-Package: org.eclipse.mylyn.bugzilla.rest.core.tests;x-internal:=true,
  org.eclipse.mylyn.bugzilla.rest.test.support;x-internal:=true
+Import-Package: org.apache.commons.io;version="2.8.0"
diff --git a/mylyn.tasks/connectors/bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/META-INF/MANIFEST.MF b/mylyn.tasks/connectors/bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/META-INF/MANIFEST.MF
index bb055807f0..7907ad6886 100644
--- a/mylyn.tasks/connectors/bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/META-INF/MANIFEST.MF
+++ b/mylyn.tasks/connectors/bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/META-INF/MANIFEST.MF
@@ -5,11 +5,8 @@ Bundle-SymbolicName: org.eclipse.mylyn.bugzilla.rest.core;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Require-Bundle: com.google.gson;bundle-version="0.0.0",
  com.google.guava;bundle-version="0.0.0",
- org.apache.commons.io;bundle-version="0.0.0",
  org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.equinox.security;bundle-version="0.0.0",
- org.apache.httpcomponents.httpclient;bundle-version="0.0.0",
- org.apache.httpcomponents.httpcore;bundle-version="0.0.0",
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
  org.eclipse.mylyn.commons.core;bundle-version="4.0.0",
  org.eclipse.mylyn.commons.net;bundle-version="4.0.0",
@@ -21,5 +18,8 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.mylyn.internal.bugzilla.rest.core,
  org.eclipse.mylyn.internal.bugzilla.rest.core.response.data
 Import-Package: org.apache.commons.codec;version="1.14.0",
- org.apache.commons.lang;version="2.6.0"
+ org.apache.commons.io;version="2.8.0",
+ org.apache.commons.lang;version="2.6.0",
+ org.apache.http;version="4.4.16",
+ org.apache.http.client.methods;version="4.5.13"
 Bundle-Vendor: Eclipse Mylyn
diff --git a/mylyn.tasks/connectors/bugzilla/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF b/mylyn.tasks/connectors/bugzilla/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
index 4776b0f7b0..ba733fc01e 100644
--- a/mylyn.tasks/connectors/bugzilla/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
+++ b/mylyn.tasks/connectors/bugzilla/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Bugzilla Connector Tests
 Bundle-SymbolicName: org.eclipse.mylyn.bugzilla.tests;singleton:=true
 Bundle-Version: 4.0.0.qualifier
-Require-Bundle: org.apache.commons.io;bundle-version="0.0.0",
- org.eclipse.compare;bundle-version="0.0.0",
+Require-Bundle: org.eclipse.compare;bundle-version="0.0.0",
  org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.jface.text;bundle-version="0.0.0",
  org.eclipse.mylyn.bugzilla.core;bundle-version="4.0.0",
@@ -33,5 +32,6 @@ Export-Package: org.eclipse.mylyn.bugzilla.tests;x-internal:=true,
  org.eclipse.mylyn.bugzilla.tests.support;x-internal:=true,
  org.eclipse.mylyn.bugzilla.tests.ui;x-internal:=true
 Import-Package: org.apache.commons.httpclient;version="3.1.0",
+ org.apache.commons.io;version="2.8.0",
  org.apache.xmlrpc;version="0.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/mylyn.tasks/connectors/trac/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF b/mylyn.tasks/connectors/trac/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
index ea69c029f0..17a37ecff5 100644
--- a/mylyn.tasks/connectors/trac/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
+++ b/mylyn.tasks/connectors/trac/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
@@ -3,9 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Mylyn Trac Connector Tests
 Bundle-SymbolicName: org.eclipse.mylyn.trac.tests;singleton:=true
 Bundle-Version: 4.0.0.qualifier
-Require-Bundle: org.apache.commons.lang;bundle-version="2.4.0",
- org.apache.ws.commons.util;bundle-version="1.0.0",
- org.eclipse.core.runtime;bundle-version="0.0.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.jface.text;bundle-version="0.0.0",
  org.eclipse.mylyn.commons.net;bundle-version="4.0.0",
  org.eclipse.mylyn.commons.repositories.core;bundle-version="4.0.0",
@@ -26,6 +24,7 @@ Export-Package: org.eclipse.mylyn.trac.tests;x-internal:=true,
  org.eclipse.mylyn.trac.tests.support;x-internal:=true,
  org.eclipse.mylyn.trac.tests.ui;x-internal:=true
 Import-Package: org.apache.commons.httpclient;version="3.1.0",
+ org.apache.commons.lang;version="2.6.0",
  org.apache.xmlrpc;version="0.0.0",
  org.apache.xmlrpc.client,
  org.apache.xmlrpc.common
diff --git a/mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF b/mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
index 2ee69847da..ad400291c4 100644
--- a/mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
+++ b/mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@ Require-Bundle: com.google.guava;bundle-version="0.0.0",
  org.eclipse.equinox.security;bundle-version="0.0.0",
  org.eclipse.mylyn.commons.core;bundle-version="4.0.0",
  org.eclipse.mylyn.commons.net;bundle-version="4.0.0",
- org.apache.xerces;bundle-version="0.0.0",
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
  org.eclipse.mylyn.commons.repositories.core;bundle-version="4.0.0"
 Export-Package: org.eclipse.mylyn.internal.tasks.core;x-friends:="org.eclipse.mylyn.tasks.ui,org.eclipse.mylyn.tasks.bugs",
@@ -28,5 +27,7 @@ Export-Package: org.eclipse.mylyn.internal.tasks.core;x-friends:="org.eclipse.my
  org.eclipse.mylyn.tasks.core.data,
  org.eclipse.mylyn.tasks.core.spi,
  org.eclipse.mylyn.tasks.core.sync
-Import-Package: org.apache.commons.httpclient.methods.multipart;version="3.1.0"
+Import-Package: org.apache.commons.httpclient.methods.multipart;version="3.1.0",
+ org.apache.xerces.parsers;version="2.12.2",
+ org.apache.xerces.util;version="2.12.2"
 Bundle-Localization: plugin
diff --git a/mylyn.tasks/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF b/mylyn.tasks/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF
index 9f13d6d2b5..5c10601569 100644
--- a/mylyn.tasks/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF
+++ b/mylyn.tasks/org.eclipse.mylyn.tasks.index.core/META-INF/MANIFEST.MF
@@ -4,13 +4,20 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.tasks.index.core
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.apache.lucene.analysis-common;bundle-version="9.5.0",
- org.apache.lucene.core;bundle-version="9.5.0",
- org.apache.lucene.queryparser;bundle-version="9.5.0",
- org.eclipse.core.runtime;bundle-version="0.0.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.mylyn.tasks.core;bundle-version="4.0.0",
  org.eclipse.mylyn.commons.core;bundle-version="4.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.mylyn.internal.tasks.index.core;x-internal:=true
+Import-Package: org.apache.lucene.analysis;version="9.5.0",
+ org.apache.lucene.analysis.core;version="9.5.0",
+ org.apache.lucene.analysis.miscellaneous;version="9.5.0",
+ org.apache.lucene.analysis.standard;version="9.5.0",
+ org.apache.lucene.document;version="9.5.0",
+ org.apache.lucene.index;version="9.5.0",
+ org.apache.lucene.queryparser.classic;version="9.5.0",
+ org.apache.lucene.search;version="9.5.0",
+ org.apache.lucene.store;version="9.5.0",
+ org.apache.lucene.util;version="9.5.0"
 
diff --git a/mylyn.versions/org.eclipse.mylyn.git.ui/META-INF/MANIFEST.MF b/mylyn.versions/org.eclipse.mylyn.git.ui/META-INF/MANIFEST.MF
index 7097dc806b..bbc1884b47 100644
--- a/mylyn.versions/org.eclipse.mylyn.git.ui/META-INF/MANIFEST.MF
+++ b/mylyn.versions/org.eclipse.mylyn.git.ui/META-INF/MANIFEST.MF
@@ -4,8 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.git.ui;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.apache.commons.lang;bundle-version="2.6.0",
- org.eclipse.core.runtime;bundle-version="0.0.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.core.resources;bundle-version="0.0.0",
  org.eclipse.egit.core;bundle-version="0.0.0",
  org.eclipse.egit.ui;bundle-version="0.0.0",
@@ -22,3 +21,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Localization: plugin
 Export-Package: org.eclipse.mylyn.internal.git.ui;x-internal:=true,
  org.eclipse.mylyn.internal.git.ui.connector;x-internal:=true
+Import-Package: org.apache.commons.lang.reflect;version="2.6.0"
diff --git a/org.eclipse.mylyn-site/category.xml b/org.eclipse.mylyn-site/category.xml
index a6a5b7ff5e..02a254ba6e 100644
--- a/org.eclipse.mylyn-site/category.xml
+++ b/org.eclipse.mylyn-site/category.xml
@@ -169,29 +169,32 @@
    <bundle id="javax.activation" version="1.2.2.v20221203-1659"/>
    <bundle id="javax.activation" version="2.0.0.v20221203-1659"/>
    <bundle id="javax.xml.stream"/>
-   <bundle id="org.glassfish.hk2.osgi-resource-locator"/>
+   <bundle id="org.apache.ant"/>
    <bundle id="org.apache.commons.codec"/>
    <bundle id="org.apache.commons.httpclient"/>
+   <bundle id="org.apache.commons.io"/>
    <bundle id="org.apache.commons.lang"/>
-   <bundle id="org.apache.commons.logging"/>
+   <bundle id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
+   <bundle id="org.apache.httpcomponents.httpclient"/>
+   <bundle id="org.apache.httpcomponents.httpcore"/>
    <bundle id="org.apache.lucene.analysis-common"/>
    <bundle id="org.apache.lucene.core"/>
    <bundle id="org.apache.lucene.queries"/>
    <bundle id="org.apache.lucene.queryparser"/>
    <bundle id="org.apache.lucene.sandbox"/>
+   <bundle id="org.apache.xerces"/>
    <bundle id="org.apache.xml.resolver"/>
    <bundle id="org.apache.xmlrpc.client"/>
    <bundle id="org.apache.xmlrpc.common"/>
    <bundle id="org.apache.xmlrpc.server"/>
-   <bundle id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
-   <bundle id="com.google.guava"/>
-   <bundle id="com.google.guava.failureaccess"/>
-   <bundle id="com.google.gson"/>
-   <bundle id="org.apache.commons.httpclient"/>
    <bundle id="org.apache.ws.commons.util"/>
+   <bundle id="org.glassfish.hk2.osgi-resource-locator"/>
    <bundle id="com.google.gerrit.common"/>
    <bundle id="com.google.gerrit.prettify"/>
    <bundle id="com.google.gerrit.reviewdb"/>
+   <bundle id="com.google.gson"/>
+   <bundle id="com.google.guava"/>
+   <bundle id="com.google.guava.failureaccess"/>
    <bundle id="com.google.gwt.servlet"/>
    <bundle id="com.google.gwtjsonrpc"/>
    <bundle id="com.google.gwtorm"/>