diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product
index ff7066aa42..7aee8e569a 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="TimeServiceHost XmlRpc Zeroconf Discovery" uid="com.mycorp.examples.timeservice.xmlrpc.j8.product" version="1.1.0.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="TimeServiceHost XmlRpc Zeroconf Discovery" uid="com.mycorp.examples.timeservice.xmlrpc.j8.product" version="1.1.1.qualifier" useFeatures="false" includeLaunchers="false">
 
    <configIni use="default">
    </configIni>
@@ -37,7 +37,7 @@
       <plugin id="com.mycorp.examples.timeservice.async"/>
       <plugin id="com.mycorp.examples.timeservice.host"/>
       <plugin id="javax.servlet"/>
-      <plugin id="org.apache.commons.codec"/>
+      <plugin id="org.apache.commons.commons-codec"/>
       <plugin id="org.apache.commons.logging"/>
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>
@@ -86,7 +86,7 @@
    <configurations>
       <plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="0" />
       <plugin id="javax.servlet" autoStart="true" startLevel="0" />
-      <plugin id="org.apache.commons.codec" autoStart="true" startLevel="0" />
+      <plugin id="org.apache.commons.commons-codec" autoStart="true" startLevel="0" />
       <plugin id="org.apache.commons.logging" autoStart="true" startLevel="0" />
       <plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
       <plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
diff --git a/pom.xml b/pom.xml
index a055baacdd..47c6264baa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@
     <tycho-version>2.7.5</tycho-version>
     <cbi-version>1.3.2</cbi-version>
     <target-platform>2022-03</target-platform>
+    <execution-environment>JavaSE-17</execution-environment>
     <eclipserun-repo>https://download.eclipse.org/eclipse/updates/latest/</eclipserun-repo>
     <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
     <project.resources.sourceEncoding>ISO-8859-1</project.resources.sourceEncoding>
@@ -285,6 +286,7 @@
               <version>1.0.0-SNAPSHOT</version>
             </artifact>
           </target>
+          <executionEnvironment>${execution-environment}</executionEnvironment>
           <environments>
             <environment>
               <os>win32</os>
@@ -405,7 +407,7 @@
                 <url>${eclipserun-repo}</url>
               </repository>
             </repositories>
-            <executionEnvironment>JavaSE-11</executionEnvironment>
+            <executionEnvironment>${execution-environment}</executionEnvironment>
           </configuration>
         </plugin>
         <plugin>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/src/org/eclipse/ecf/internal/provider/filetransfer/httpclientjava/HttpClientProxyCredentialProvider.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/src/org/eclipse/ecf/internal/provider/filetransfer/httpclientjava/HttpClientProxyCredentialProvider.java
index 962e8351d5..5c685511d8 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/src/org/eclipse/ecf/internal/provider/filetransfer/httpclientjava/HttpClientProxyCredentialProvider.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/src/org/eclipse/ecf/internal/provider/filetransfer/httpclientjava/HttpClientProxyCredentialProvider.java
@@ -74,7 +74,7 @@ protected NTCredentials getNTLMCredentials(Proxy proxy) {
 	@Override
 	protected PasswordAuthentication getPasswordAuthentication() {
 		if (getRequestorType() == RequestorType.PROXY) {
-			Credentials credential = getCredentials(null); // TODO
+			Credentials credential = getCredentials(new AuthScope(getRequestingHost(), getRequestingPort()));
 			if (credential != null) {
 				return new PasswordAuthentication(credential.getUserName(), credential.getPassword());
 			}
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml
index ec88bfac86..bf5a5b6533 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.filetransfer.httpclient4.feature"
       label="%featureName"
-      version="3.14.32.qualifier"
+      version="3.14.33.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -31,7 +31,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.codec"
+         id="org.apache.commons.commons-codec"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml
index b34f9ce06a..dadec82bc9 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.filetransfer.httpclient4.feature</artifactId>
-  <version>3.14.32-SNAPSHOT</version>
+  <version>3.14.33-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
index b2a5b32f55..1e3002d6ac 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.filetransfer.httpclient45.feature"
       label="%featureName"
-      version="1.1.100.qualifier"
+      version="1.1.101.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -39,7 +39,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.codec"
+         id="org.apache.commons.commons-codec"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/pom.xml
index 57404365e2..b3223c61b9 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.filetransfer.httpclient45.feature</artifactId>
-  <version>1.1.100-SNAPSHOT</version>
+  <version>1.1.101-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml
index 852d187f34..2386a17b0e 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml
@@ -39,14 +39,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.codec"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.logging"
+         id="org.apache.commons.commons-codec"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
index bbbaa2db67..da5ff4c7aa 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
@@ -24,7 +24,7 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services
 
    <requires>
       <import feature="org.eclipse.ecf.remoteservice.feature" version="2.1" match="compatible"/>
-      <import plugin="org.apache.commons.codec" version="1.6" match="compatible"/>
+      <import plugin="org.apache.commons.commons-codec" version="1.6" match="compatible"/>
       <import plugin="org.apache.commons.logging" version="1.2.0" match="compatible"/>
       <import plugin="org.apache.httpcomponents.httpclient" version="4.2" match="compatible"/>
       <import plugin="org.apache.httpcomponents.httpcore" version="4.2" match="compatible"/>
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-2022-03.target b/releng/org.eclipse.ecf.releng.target/ecf-2022-03.target
index ef88c1c3f7..0ca2e0142e 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-2022-03.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-2022-03.target
@@ -23,22 +23,24 @@
 			<repository location="https://download.eclipse.org/releases/2022-03"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<unit id="org.apache.commons.codec" version="1.14.0.v20221112-0806"/>
-			<unit id="org.apache.commons.codec.source" version="1.14.0.v20221112-0806"/>
-			<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
-			<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
+			<unit id="org.apache.commons.commons-codec" version="1.16.0"/>
+			<unit id="org.apache.commons.commons-codec.source" version="1.16.0"/>
+			<unit id="org.apache.httpcomponents.client5.httpclient5" version="5.2.1.v20230802-0806"/>
+			<unit id="org.apache.httpcomponents.client5.httpclient5.source" version="5.2.1.v20230802-0806"/>
+			<unit id="org.apache.httpcomponents.client5.httpclient5-win" version="5.2.1.v20230802-0847"/>
+			<unit id="org.apache.httpcomponents.client5.httpclient5-win.source" version="5.2.1.v20230802-0847"/>
+			<unit id="org.apache.httpcomponents.core5.httpcore5" version="5.2.3.v20230922-1600"/>
+			<unit id="org.apache.httpcomponents.core5.httpcore5.source" version="5.2.3.v20230922-1600"/>
+			<unit id="org.apache.httpcomponents.core5.httpcore5-h2" version="5.2.3.v20230922-1600"/>
+			<unit id="org.apache.httpcomponents.core5.httpcore5-h2.source" version="5.2.3.v20230922-1600"/>
+			<unit id="org.apache.commons.logging" version="1.2.0"/>
+			<unit id="org.apache.commons.logging.source" version="1.2.0"/>
+			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
 			<unit id="org.apache.log4j.source" version="1.2.24.v20221221-2012"/>
 			<unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/>
-			<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14.v20221207-1049"/>
-			<unit id="org.apache.httpcomponents.client5.httpclient5" version="5.1.3.v20221013-1742"/>
-			<unit id="org.apache.httpcomponents.client5.httpclient5.source" version="5.1.3.v20221013-1742"/>
-			<unit id="org.apache.httpcomponents.client5.httpclient5-win" version="5.1.3.v20221013-1742"/>
-			<unit id="org.apache.httpcomponents.client5.httpclient5-win.source" version="5.1.3.v20221013-1742"/>
-			<unit id="org.apache.httpcomponents.core5.httpcore5" version="5.1.4.v20221013-1742"/>
-			<unit id="org.apache.httpcomponents.core5.httpcore5.source" version="5.1.4.v20221013-1742"/>
-			<unit id="org.apache.httpcomponents.core5.httpcore5-h2" version="5.1.4.v20221013-1742"/>
-			<unit id="org.apache.httpcomponents.core5.httpcore5-h2.source" version="5.1.4.v20221013-1742"/>
 			<unit id="org.slf4j.binding.log4j12" version="1.7.30.v20221112-0806"/>
 			<unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20221112-0806"/>
 			<unit id="com.sun.jna" version="4.5.1.v20210503-0343"/>
@@ -71,596 +73,4 @@
 		</location>
 	</locations>
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-	<includeBundles>
-		<plugin id="com.ibm.icu" version="73.1"/>
-		<plugin id="com.ibm.icu.source" version="73.1.0"/>
-		<plugin id="com.jcraft.jsch"/>
-		<plugin id="com.jcraft.jsch.source"/>
-		<plugin id="com.sun.el"/>
-		<plugin id="com.sun.el.source"/>
-		<plugin id="com.sun.jna" version="4.5.1.v20210503-0343"/>
-		<plugin id="com.sun.jna" version="5.8.0.v20210503-0343"/>
-		<plugin id="com.sun.jna.platform" version="5.8.0.v20221112-0806"/>
-		<plugin id="com.sun.jna.platform" version="4.5.1.v20221112-0806"/>
-		<plugin id="com.sun.jna.platform.source" version="5.8.0.v20221112-0806"/>
-		<plugin id="com.sun.jna.platform.source" version="4.5.1.v20221112-0806"/>
-		<plugin id="com.sun.jna.source" version="5.8.0.v20210503-0343"/>
-		<plugin id="com.sun.jna.source" version="4.5.1.v20210503-0343"/>
-		<plugin id="com.sun.syndication"/>
-		<plugin id="com.sun.syndication.source"/>
-		<plugin id="jakarta.servlet-api" version="4.0.0"/>
-		<plugin id="jakarta.servlet-api.source" version="4.0.0"/>
-		<plugin id="javax.annotation"/>
-		<plugin id="javax.annotation.source"/>
-		<plugin id="javax.el" version="2.2.0.v201303151357"/>
-		<plugin id="javax.el.source" version="2.2.0.v201303151357"/>
-		<plugin id="javax.inject" version="1.0.0.v20091030"/>
-		<plugin id="javax.inject.source" version="1.0.0.v20091030"/>
-		<plugin id="javax.servlet.jsp"/>
-		<plugin id="javax.servlet.jsp.source"/>
-		<plugin id="org.apache.ant"/>
-		<plugin id="org.apache.ant.source"/>
-		<plugin id="org.apache.batik.constants"/>
-		<plugin id="org.apache.batik.constants.source"/>
-		<plugin id="org.apache.batik.css"/>
-		<plugin id="org.apache.batik.css.source"/>
-		<plugin id="org.apache.batik.i18n"/>
-		<plugin id="org.apache.batik.i18n.source"/>
-		<plugin id="org.apache.batik.util"/>
-		<plugin id="org.apache.batik.util.source"/>
-		<plugin id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
-		<plugin id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/>
-		<plugin id="org.apache.commons.httpclient"/>
-		<plugin id="org.apache.commons.httpclient.source"/>
-		<plugin id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
-		<plugin id="org.apache.commons.io.source" version="2.8.0.v20210415-0900"/>
-		<plugin id="org.apache.commons.jxpath"/>
-		<plugin id="org.apache.commons.jxpath.source"/>
-		<plugin id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
-		<plugin id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
-		<plugin id="org.apache.felix.gogo.command" version="1.1.2.v20210111-1007"/>
-		<plugin id="org.apache.felix.gogo.command.source" version="1.1.2.v20210111-1007"/>
-		<plugin id="org.apache.felix.gogo.runtime" version="1.1.6"/>
-		<plugin id="org.apache.felix.gogo.runtime.source" version="1.1.6"/>
-		<plugin id="org.apache.felix.gogo.shell" version="1.1.4.v20210111-1007"/>
-		<plugin id="org.apache.felix.gogo.shell.source" version="1.1.4.v20210111-1007"/>
-		<plugin id="org.apache.felix.scr" version="2.2.6"/>
-		<plugin id="org.apache.felix.scr.source" version="2.2.6"/>
-		<plugin id="org.apache.hadoop.zookeeper"/>
-		<plugin id="org.apache.hadoop.zookeeper.source"/>
-		<plugin id="org.apache.httpcomponents.client5.httpclient5" version="5.1.3.v20221013-1742"/>
-		<plugin id="org.apache.httpcomponents.client5.httpclient5-win" version="5.1.3.v20221013-1742"/>
-		<plugin id="org.apache.httpcomponents.client5.httpclient5-win.source" version="5.1.3.v20221013-1742"/>
-		<plugin id="org.apache.httpcomponents.client5.httpclient5.source" version="5.1.3.v20221013-1742"/>
-		<plugin id="org.apache.httpcomponents.core5.httpcore5" version="5.1.4.v20221013-1742"/>
-		<plugin id="org.apache.httpcomponents.core5.httpcore5-h2" version="5.1.4.v20221013-1742"/>
-		<plugin id="org.apache.httpcomponents.core5.httpcore5-h2.source" version="5.1.4.v20221013-1742"/>
-		<plugin id="org.apache.httpcomponents.core5.httpcore5.source" version="5.1.4.v20221013-1742"/>
-		<plugin id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/>
-		<plugin id="org.apache.httpcomponents.httpclient.source" version="4.5.14.v20221207-1049"/>
-		<plugin id="org.apache.httpcomponents.httpclient.win"/>
-		<plugin id="org.apache.httpcomponents.httpclient.win.source"/>
-		<plugin id="org.apache.httpcomponents.httpcore" version="4.4.16.v20221207-1049"/>
-		<plugin id="org.apache.httpcomponents.httpcore.source" version="4.4.16.v20221207-1049"/>
-		<plugin id="org.apache.jasper.glassfish"/>
-		<plugin id="org.apache.jasper.glassfish.source"/>
-		<plugin id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
-		<plugin id="org.apache.log4j.source" version="1.2.24.v20221221-2012"/>
-		<plugin id="org.apache.lucene.analyzers-common"/>
-		<plugin id="org.apache.lucene.analyzers-common.source"/>
-		<plugin id="org.apache.lucene.analyzers-smartcn"/>
-		<plugin id="org.apache.lucene.analyzers-smartcn.source"/>
-		<plugin id="org.apache.lucene.core"/>
-		<plugin id="org.apache.lucene.core.source"/>
-		<plugin id="org.apache.xmlgraphics"/>
-		<plugin id="org.apache.xmlgraphics.source"/>
-		<plugin id="org.apiguardian"/>
-		<plugin id="org.apiguardian.source"/>
-		<plugin id="org.bouncycastle.bcpg"/>
-		<plugin id="org.bouncycastle.bcpg.source"/>
-		<plugin id="org.bouncycastle.bcprov"/>
-		<plugin id="org.bouncycastle.bcprov.source"/>
-		<plugin id="org.eclipse.ant.core"/>
-		<plugin id="org.eclipse.ant.core.source"/>
-		<plugin id="org.eclipse.ant.launching"/>
-		<plugin id="org.eclipse.ant.launching.source"/>
-		<plugin id="org.eclipse.ant.ui"/>
-		<plugin id="org.eclipse.ant.ui.source"/>
-		<plugin id="org.eclipse.compare"/>
-		<plugin id="org.eclipse.compare.core"/>
-		<plugin id="org.eclipse.compare.core.source"/>
-		<plugin id="org.eclipse.compare.source"/>
-		<plugin id="org.eclipse.compare.win32"/>
-		<plugin id="org.eclipse.compare.win32.source"/>
-		<plugin id="org.eclipse.core.commands"/>
-		<plugin id="org.eclipse.core.commands.source"/>
-		<plugin id="org.eclipse.core.contenttype"/>
-		<plugin id="org.eclipse.core.contenttype.source"/>
-		<plugin id="org.eclipse.core.databinding"/>
-		<plugin id="org.eclipse.core.databinding.beans"/>
-		<plugin id="org.eclipse.core.databinding.beans.source"/>
-		<plugin id="org.eclipse.core.databinding.observable"/>
-		<plugin id="org.eclipse.core.databinding.observable.source"/>
-		<plugin id="org.eclipse.core.databinding.property"/>
-		<plugin id="org.eclipse.core.databinding.property.source"/>
-		<plugin id="org.eclipse.core.databinding.source"/>
-		<plugin id="org.eclipse.core.expressions"/>
-		<plugin id="org.eclipse.core.expressions.source"/>
-		<plugin id="org.eclipse.core.externaltools"/>
-		<plugin id="org.eclipse.core.externaltools.source"/>
-		<plugin id="org.eclipse.core.filebuffers"/>
-		<plugin id="org.eclipse.core.filebuffers.source"/>
-		<plugin id="org.eclipse.core.filesystem"/>
-		<plugin id="org.eclipse.core.filesystem.source"/>
-		<plugin id="org.eclipse.core.filesystem.win32.x86_64"/>
-		<plugin id="org.eclipse.core.jobs"/>
-		<plugin id="org.eclipse.core.jobs.source"/>
-		<plugin id="org.eclipse.core.net"/>
-		<plugin id="org.eclipse.core.net.source"/>
-		<plugin id="org.eclipse.core.net.win32.x86_64"/>
-		<plugin id="org.eclipse.core.net.win32.x86_64.source"/>
-		<plugin id="org.eclipse.core.resources"/>
-		<plugin id="org.eclipse.core.resources.source"/>
-		<plugin id="org.eclipse.core.resources.win32.x86_64"/>
-		<plugin id="org.eclipse.core.runtime"/>
-		<plugin id="org.eclipse.core.runtime.source"/>
-		<plugin id="org.eclipse.core.variables"/>
-		<plugin id="org.eclipse.core.variables.source"/>
-		<plugin id="org.eclipse.debug.core"/>
-		<plugin id="org.eclipse.debug.core.source"/>
-		<plugin id="org.eclipse.debug.ui"/>
-		<plugin id="org.eclipse.debug.ui.launchview"/>
-		<plugin id="org.eclipse.debug.ui.launchview.source"/>
-		<plugin id="org.eclipse.debug.ui.source"/>
-		<plugin id="org.eclipse.e4.core.commands"/>
-		<plugin id="org.eclipse.e4.core.commands.source"/>
-		<plugin id="org.eclipse.e4.core.contexts"/>
-		<plugin id="org.eclipse.e4.core.contexts.source"/>
-		<plugin id="org.eclipse.e4.core.di"/>
-		<plugin id="org.eclipse.e4.core.di.annotations"/>
-		<plugin id="org.eclipse.e4.core.di.annotations.source"/>
-		<plugin id="org.eclipse.e4.core.di.extensions"/>
-		<plugin id="org.eclipse.e4.core.di.extensions.source"/>
-		<plugin id="org.eclipse.e4.core.di.extensions.supplier"/>
-		<plugin id="org.eclipse.e4.core.di.extensions.supplier.source"/>
-		<plugin id="org.eclipse.e4.core.di.source"/>
-		<plugin id="org.eclipse.e4.core.services"/>
-		<plugin id="org.eclipse.e4.core.services.source"/>
-		<plugin id="org.eclipse.e4.emf.xpath"/>
-		<plugin id="org.eclipse.e4.emf.xpath.source"/>
-		<plugin id="org.eclipse.e4.tools.emf.ui"/>
-		<plugin id="org.eclipse.e4.tools.emf.ui.source"/>
-		<plugin id="org.eclipse.e4.tools.services"/>
-		<plugin id="org.eclipse.e4.tools.services.source"/>
-		<plugin id="org.eclipse.e4.ui.bindings"/>
-		<plugin id="org.eclipse.e4.ui.bindings.source"/>
-		<plugin id="org.eclipse.e4.ui.css.core"/>
-		<plugin id="org.eclipse.e4.ui.css.core.source"/>
-		<plugin id="org.eclipse.e4.ui.css.swt"/>
-		<plugin id="org.eclipse.e4.ui.css.swt.source"/>
-		<plugin id="org.eclipse.e4.ui.css.swt.theme"/>
-		<plugin id="org.eclipse.e4.ui.css.swt.theme.source"/>
-		<plugin id="org.eclipse.e4.ui.di"/>
-		<plugin id="org.eclipse.e4.ui.di.source"/>
-		<plugin id="org.eclipse.e4.ui.dialogs"/>
-		<plugin id="org.eclipse.e4.ui.dialogs.source"/>
-		<plugin id="org.eclipse.e4.ui.ide"/>
-		<plugin id="org.eclipse.e4.ui.ide.source"/>
-		<plugin id="org.eclipse.e4.ui.model.workbench"/>
-		<plugin id="org.eclipse.e4.ui.model.workbench.source"/>
-		<plugin id="org.eclipse.e4.ui.services"/>
-		<plugin id="org.eclipse.e4.ui.services.source"/>
-		<plugin id="org.eclipse.e4.ui.swt.win32"/>
-		<plugin id="org.eclipse.e4.ui.swt.win32.source"/>
-		<plugin id="org.eclipse.e4.ui.widgets"/>
-		<plugin id="org.eclipse.e4.ui.widgets.source"/>
-		<plugin id="org.eclipse.e4.ui.workbench"/>
-		<plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
-		<plugin id="org.eclipse.e4.ui.workbench.addons.swt.source"/>
-		<plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
-		<plugin id="org.eclipse.e4.ui.workbench.renderers.swt.source"/>
-		<plugin id="org.eclipse.e4.ui.workbench.source"/>
-		<plugin id="org.eclipse.e4.ui.workbench.swt"/>
-		<plugin id="org.eclipse.e4.ui.workbench.swt.source"/>
-		<plugin id="org.eclipse.e4.ui.workbench3"/>
-		<plugin id="org.eclipse.e4.ui.workbench3.source"/>
-		<plugin id="org.eclipse.ecf"/>
-		<plugin id="org.eclipse.ecf.filetransfer"/>
-		<plugin id="org.eclipse.ecf.filetransfer.source"/>
-		<plugin id="org.eclipse.ecf.identity"/>
-		<plugin id="org.eclipse.ecf.identity.source"/>
-		<plugin id="org.eclipse.ecf.provider.filetransfer"/>
-		<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient5"/>
-		<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient5.source"/>
-		<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient5.win32"/>
-		<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient5.win32.source"/>
-		<plugin id="org.eclipse.ecf.provider.filetransfer.source"/>
-		<plugin id="org.eclipse.ecf.provider.filetransfer.ssl"/>
-		<plugin id="org.eclipse.ecf.provider.filetransfer.ssl.source"/>
-		<plugin id="org.eclipse.ecf.source"/>
-		<plugin id="org.eclipse.ecf.ssl"/>
-		<plugin id="org.eclipse.ecf.ssl.source"/>
-		<plugin id="org.eclipse.emf.common"/>
-		<plugin id="org.eclipse.emf.common.source"/>
-		<plugin id="org.eclipse.emf.common.ui"/>
-		<plugin id="org.eclipse.emf.common.ui.source"/>
-		<plugin id="org.eclipse.emf.databinding"/>
-		<plugin id="org.eclipse.emf.databinding.edit"/>
-		<plugin id="org.eclipse.emf.databinding.edit.source"/>
-		<plugin id="org.eclipse.emf.databinding.source"/>
-		<plugin id="org.eclipse.emf.ecore"/>
-		<plugin id="org.eclipse.emf.ecore.change"/>
-		<plugin id="org.eclipse.emf.ecore.change.source"/>
-		<plugin id="org.eclipse.emf.ecore.source"/>
-		<plugin id="org.eclipse.emf.ecore.xmi"/>
-		<plugin id="org.eclipse.emf.ecore.xmi.source"/>
-		<plugin id="org.eclipse.emf.edit"/>
-		<plugin id="org.eclipse.emf.edit.source"/>
-		<plugin id="org.eclipse.emf.edit.ui"/>
-		<plugin id="org.eclipse.emf.edit.ui.source"/>
-		<plugin id="org.eclipse.equinox.app"/>
-		<plugin id="org.eclipse.equinox.app.source"/>
-		<plugin id="org.eclipse.equinox.bidi"/>
-		<plugin id="org.eclipse.equinox.bidi.source"/>
-		<plugin id="org.eclipse.equinox.common"/>
-		<plugin id="org.eclipse.equinox.common.source"/>
-		<plugin id="org.eclipse.equinox.concurrent"/>
-		<plugin id="org.eclipse.equinox.concurrent.source"/>
-		<plugin id="org.eclipse.equinox.console"/>
-		<plugin id="org.eclipse.equinox.console.source"/>
-		<plugin id="org.eclipse.equinox.event"/>
-		<plugin id="org.eclipse.equinox.event.source"/>
-		<plugin id="org.eclipse.equinox.frameworkadmin"/>
-		<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
-		<plugin id="org.eclipse.equinox.frameworkadmin.equinox.source"/>
-		<plugin id="org.eclipse.equinox.frameworkadmin.source"/>
-		<plugin id="org.eclipse.equinox.http.jetty"/>
-		<plugin id="org.eclipse.equinox.http.jetty.source"/>
-		<plugin id="org.eclipse.equinox.http.registry"/>
-		<plugin id="org.eclipse.equinox.http.registry.source"/>
-		<plugin id="org.eclipse.equinox.http.servlet"/>
-		<plugin id="org.eclipse.equinox.http.servlet.source"/>
-		<plugin id="org.eclipse.equinox.jsp.jasper"/>
-		<plugin id="org.eclipse.equinox.jsp.jasper.registry"/>
-		<plugin id="org.eclipse.equinox.jsp.jasper.registry.source"/>
-		<plugin id="org.eclipse.equinox.jsp.jasper.source"/>
-		<plugin id="org.eclipse.equinox.launcher"/>
-		<plugin id="org.eclipse.equinox.launcher.source"/>
-		<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
-		<plugin id="org.eclipse.equinox.p2.artifact.repository"/>
-		<plugin id="org.eclipse.equinox.p2.artifact.repository.source"/>
-		<plugin id="org.eclipse.equinox.p2.console"/>
-		<plugin id="org.eclipse.equinox.p2.console.source"/>
-		<plugin id="org.eclipse.equinox.p2.core"/>
-		<plugin id="org.eclipse.equinox.p2.core.source"/>
-		<plugin id="org.eclipse.equinox.p2.director"/>
-		<plugin id="org.eclipse.equinox.p2.director.app"/>
-		<plugin id="org.eclipse.equinox.p2.director.app.source"/>
-		<plugin id="org.eclipse.equinox.p2.director.source"/>
-		<plugin id="org.eclipse.equinox.p2.directorywatcher"/>
-		<plugin id="org.eclipse.equinox.p2.directorywatcher.source"/>
-		<plugin id="org.eclipse.equinox.p2.engine"/>
-		<plugin id="org.eclipse.equinox.p2.engine.source"/>
-		<plugin id="org.eclipse.equinox.p2.extensionlocation"/>
-		<plugin id="org.eclipse.equinox.p2.extensionlocation.source"/>
-		<plugin id="org.eclipse.equinox.p2.garbagecollector"/>
-		<plugin id="org.eclipse.equinox.p2.garbagecollector.source"/>
-		<plugin id="org.eclipse.equinox.p2.jarprocessor"/>
-		<plugin id="org.eclipse.equinox.p2.jarprocessor.source"/>
-		<plugin id="org.eclipse.equinox.p2.metadata"/>
-		<plugin id="org.eclipse.equinox.p2.metadata.repository"/>
-		<plugin id="org.eclipse.equinox.p2.metadata.repository.source"/>
-		<plugin id="org.eclipse.equinox.p2.metadata.source"/>
-		<plugin id="org.eclipse.equinox.p2.operations"/>
-		<plugin id="org.eclipse.equinox.p2.operations.source"/>
-		<plugin id="org.eclipse.equinox.p2.publisher"/>
-		<plugin id="org.eclipse.equinox.p2.publisher.eclipse"/>
-		<plugin id="org.eclipse.equinox.p2.publisher.eclipse.source"/>
-		<plugin id="org.eclipse.equinox.p2.publisher.source"/>
-		<plugin id="org.eclipse.equinox.p2.reconciler.dropins"/>
-		<plugin id="org.eclipse.equinox.p2.reconciler.dropins.source"/>
-		<plugin id="org.eclipse.equinox.p2.repository"/>
-		<plugin id="org.eclipse.equinox.p2.repository.source"/>
-		<plugin id="org.eclipse.equinox.p2.repository.tools"/>
-		<plugin id="org.eclipse.equinox.p2.repository.tools.source"/>
-		<plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/>
-		<plugin id="org.eclipse.equinox.p2.touchpoint.eclipse.source"/>
-		<plugin id="org.eclipse.equinox.p2.touchpoint.natives"/>
-		<plugin id="org.eclipse.equinox.p2.touchpoint.natives.source"/>
-		<plugin id="org.eclipse.equinox.p2.transport.ecf"/>
-		<plugin id="org.eclipse.equinox.p2.transport.ecf.source"/>
-		<plugin id="org.eclipse.equinox.p2.ui"/>
-		<plugin id="org.eclipse.equinox.p2.ui.importexport"/>
-		<plugin id="org.eclipse.equinox.p2.ui.importexport.source"/>
-		<plugin id="org.eclipse.equinox.p2.ui.sdk"/>
-		<plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler"/>
-		<plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler.source"/>
-		<plugin id="org.eclipse.equinox.p2.ui.sdk.source"/>
-		<plugin id="org.eclipse.equinox.p2.ui.source"/>
-		<plugin id="org.eclipse.equinox.p2.updatechecker"/>
-		<plugin id="org.eclipse.equinox.p2.updatechecker.source"/>
-		<plugin id="org.eclipse.equinox.p2.updatesite"/>
-		<plugin id="org.eclipse.equinox.p2.updatesite.source"/>
-		<plugin id="org.eclipse.equinox.preferences"/>
-		<plugin id="org.eclipse.equinox.preferences.source"/>
-		<plugin id="org.eclipse.equinox.registry"/>
-		<plugin id="org.eclipse.equinox.registry.source"/>
-		<plugin id="org.eclipse.equinox.security"/>
-		<plugin id="org.eclipse.equinox.security.source"/>
-		<plugin id="org.eclipse.equinox.security.ui"/>
-		<plugin id="org.eclipse.equinox.security.ui.source"/>
-		<plugin id="org.eclipse.equinox.security.win32.x86_64"/>
-		<plugin id="org.eclipse.equinox.security.win32.x86_64.source"/>
-		<plugin id="org.eclipse.equinox.simpleconfigurator"/>
-		<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
-		<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator.source"/>
-		<plugin id="org.eclipse.equinox.simpleconfigurator.source"/>
-		<plugin id="org.eclipse.help"/>
-		<plugin id="org.eclipse.help.base"/>
-		<plugin id="org.eclipse.help.base.source"/>
-		<plugin id="org.eclipse.help.source"/>
-		<plugin id="org.eclipse.help.ui"/>
-		<plugin id="org.eclipse.help.ui.source"/>
-		<plugin id="org.eclipse.help.webapp"/>
-		<plugin id="org.eclipse.help.webapp.source"/>
-		<plugin id="org.eclipse.jdt"/>
-		<plugin id="org.eclipse.jdt.annotation" version="2.2.600.v20200408-1511"/>
-		<plugin id="org.eclipse.jdt.annotation" version="1.2.0.v20210519-0438"/>
-		<plugin id="org.eclipse.jdt.annotation.source" version="2.2.600.v20200408-1511"/>
-		<plugin id="org.eclipse.jdt.annotation.source" version="1.2.0.v20210519-0438"/>
-		<plugin id="org.eclipse.jdt.apt.core"/>
-		<plugin id="org.eclipse.jdt.apt.core.source"/>
-		<plugin id="org.eclipse.jdt.apt.pluggable.core"/>
-		<plugin id="org.eclipse.jdt.apt.pluggable.core.source"/>
-		<plugin id="org.eclipse.jdt.apt.ui"/>
-		<plugin id="org.eclipse.jdt.apt.ui.source"/>
-		<plugin id="org.eclipse.jdt.compiler.apt"/>
-		<plugin id="org.eclipse.jdt.compiler.apt.source"/>
-		<plugin id="org.eclipse.jdt.compiler.tool"/>
-		<plugin id="org.eclipse.jdt.compiler.tool.source"/>
-		<plugin id="org.eclipse.jdt.core"/>
-		<plugin id="org.eclipse.jdt.core.formatterapp"/>
-		<plugin id="org.eclipse.jdt.core.formatterapp.source"/>
-		<plugin id="org.eclipse.jdt.core.manipulation"/>
-		<plugin id="org.eclipse.jdt.core.manipulation.source"/>
-		<plugin id="org.eclipse.jdt.core.source"/>
-		<plugin id="org.eclipse.jdt.debug"/>
-		<plugin id="org.eclipse.jdt.debug.source"/>
-		<plugin id="org.eclipse.jdt.debug.ui"/>
-		<plugin id="org.eclipse.jdt.debug.ui.source"/>
-		<plugin id="org.eclipse.jdt.doc.user"/>
-		<plugin id="org.eclipse.jdt.junit"/>
-		<plugin id="org.eclipse.jdt.junit.core"/>
-		<plugin id="org.eclipse.jdt.junit.core.source"/>
-		<plugin id="org.eclipse.jdt.junit.runtime"/>
-		<plugin id="org.eclipse.jdt.junit.runtime.source"/>
-		<plugin id="org.eclipse.jdt.junit.source"/>
-		<plugin id="org.eclipse.jdt.junit4.runtime"/>
-		<plugin id="org.eclipse.jdt.junit4.runtime.source"/>
-		<plugin id="org.eclipse.jdt.junit5.runtime"/>
-		<plugin id="org.eclipse.jdt.junit5.runtime.source"/>
-		<plugin id="org.eclipse.jdt.launching"/>
-		<plugin id="org.eclipse.jdt.launching.source"/>
-		<plugin id="org.eclipse.jdt.ui"/>
-		<plugin id="org.eclipse.jdt.ui.source"/>
-		<plugin id="org.eclipse.jetty.http"/>
-		<plugin id="org.eclipse.jetty.http.source"/>
-		<plugin id="org.eclipse.jetty.io"/>
-		<plugin id="org.eclipse.jetty.io.source"/>
-		<plugin id="org.eclipse.jetty.security"/>
-		<plugin id="org.eclipse.jetty.security.source"/>
-		<plugin id="org.eclipse.jetty.server"/>
-		<plugin id="org.eclipse.jetty.server.source"/>
-		<plugin id="org.eclipse.jetty.servlet"/>
-		<plugin id="org.eclipse.jetty.servlet.source"/>
-		<plugin id="org.eclipse.jetty.util"/>
-		<plugin id="org.eclipse.jetty.util.ajax"/>
-		<plugin id="org.eclipse.jetty.util.ajax.source"/>
-		<plugin id="org.eclipse.jetty.util.source"/>
-		<plugin id="org.eclipse.jface"/>
-		<plugin id="org.eclipse.jface.databinding"/>
-		<plugin id="org.eclipse.jface.databinding.source"/>
-		<plugin id="org.eclipse.jface.notifications"/>
-		<plugin id="org.eclipse.jface.notifications.source"/>
-		<plugin id="org.eclipse.jface.source"/>
-		<plugin id="org.eclipse.jface.text"/>
-		<plugin id="org.eclipse.jface.text.source"/>
-		<plugin id="org.eclipse.jsch.core"/>
-		<plugin id="org.eclipse.jsch.core.source"/>
-		<plugin id="org.eclipse.jsch.ui"/>
-		<plugin id="org.eclipse.jsch.ui.source"/>
-		<plugin id="org.eclipse.ltk.core.refactoring"/>
-		<plugin id="org.eclipse.ltk.core.refactoring.source"/>
-		<plugin id="org.eclipse.ltk.ui.refactoring"/>
-		<plugin id="org.eclipse.ltk.ui.refactoring.source"/>
-		<plugin id="org.eclipse.osgi" version="3.17.200.v20220215-2237"/>
-		<plugin id="org.eclipse.osgi.compatibility.state"/>
-		<plugin id="org.eclipse.osgi.compatibility.state.source"/>
-		<plugin id="org.eclipse.osgi.services" version="3.10.200.v20210723-0643"/>
-		<plugin id="org.eclipse.osgi.services.source" version="3.10.200.v20210723-0643"/>
-		<plugin id="org.eclipse.osgi.source" version="3.17.200.v20220215-2237"/>
-		<plugin id="org.eclipse.osgi.util" version="3.6.100.v20210723-1119"/>
-		<plugin id="org.eclipse.osgi.util.source" version="3.6.100.v20210723-1119"/>
-		<plugin id="org.eclipse.pde"/>
-		<plugin id="org.eclipse.pde.api.tools"/>
-		<plugin id="org.eclipse.pde.api.tools.annotations"/>
-		<plugin id="org.eclipse.pde.api.tools.annotations.source"/>
-		<plugin id="org.eclipse.pde.api.tools.source"/>
-		<plugin id="org.eclipse.pde.api.tools.ui"/>
-		<plugin id="org.eclipse.pde.api.tools.ui.source"/>
-		<plugin id="org.eclipse.pde.build"/>
-		<plugin id="org.eclipse.pde.build.source"/>
-		<plugin id="org.eclipse.pde.core"/>
-		<plugin id="org.eclipse.pde.core.source"/>
-		<plugin id="org.eclipse.pde.doc.user"/>
-		<plugin id="org.eclipse.pde.ds.annotations"/>
-		<plugin id="org.eclipse.pde.ds.annotations.source"/>
-		<plugin id="org.eclipse.pde.ds.core"/>
-		<plugin id="org.eclipse.pde.ds.core.source"/>
-		<plugin id="org.eclipse.pde.ds.lib" version="1.1.500.v20210209-1250"/>
-		<plugin id="org.eclipse.pde.ds.lib.source" version="1.1.500.v20210209-1250"/>
-		<plugin id="org.eclipse.pde.ds.ui"/>
-		<plugin id="org.eclipse.pde.ds.ui.source"/>
-		<plugin id="org.eclipse.pde.ds1_2.lib"/>
-		<plugin id="org.eclipse.pde.ds1_2.lib.source"/>
-		<plugin id="org.eclipse.pde.genericeditor.extension"/>
-		<plugin id="org.eclipse.pde.genericeditor.extension.source"/>
-		<plugin id="org.eclipse.pde.junit.runtime"/>
-		<plugin id="org.eclipse.pde.junit.runtime.source"/>
-		<plugin id="org.eclipse.pde.launching"/>
-		<plugin id="org.eclipse.pde.launching.source"/>
-		<plugin id="org.eclipse.pde.runtime"/>
-		<plugin id="org.eclipse.pde.runtime.source"/>
-		<plugin id="org.eclipse.pde.spy.bundle"/>
-		<plugin id="org.eclipse.pde.spy.bundle.source"/>
-		<plugin id="org.eclipse.pde.spy.context"/>
-		<plugin id="org.eclipse.pde.spy.context.source"/>
-		<plugin id="org.eclipse.pde.spy.core"/>
-		<plugin id="org.eclipse.pde.spy.core.source"/>
-		<plugin id="org.eclipse.pde.spy.css"/>
-		<plugin id="org.eclipse.pde.spy.css.source"/>
-		<plugin id="org.eclipse.pde.spy.model"/>
-		<plugin id="org.eclipse.pde.spy.model.source"/>
-		<plugin id="org.eclipse.pde.spy.preferences"/>
-		<plugin id="org.eclipse.pde.spy.preferences.source"/>
-		<plugin id="org.eclipse.pde.ua.core"/>
-		<plugin id="org.eclipse.pde.ua.core.source"/>
-		<plugin id="org.eclipse.pde.ua.ui"/>
-		<plugin id="org.eclipse.pde.ua.ui.source"/>
-		<plugin id="org.eclipse.pde.ui"/>
-		<plugin id="org.eclipse.pde.ui.source"/>
-		<plugin id="org.eclipse.pde.ui.templates"/>
-		<plugin id="org.eclipse.pde.ui.templates.source"/>
-		<plugin id="org.eclipse.platform"/>
-		<plugin id="org.eclipse.platform.doc.isv"/>
-		<plugin id="org.eclipse.platform.doc.user"/>
-		<plugin id="org.eclipse.platform.source"/>
-		<plugin id="org.eclipse.rcp"/>
-		<plugin id="org.eclipse.search"/>
-		<plugin id="org.eclipse.search.source"/>
-		<plugin id="org.eclipse.swt"/>
-		<plugin id="org.eclipse.swt.win32.win32.x86_64"/>
-		<plugin id="org.eclipse.swt.win32.win32.x86_64.source"/>
-		<plugin id="org.eclipse.team.core"/>
-		<plugin id="org.eclipse.team.core.source"/>
-		<plugin id="org.eclipse.team.genericeditor.diff.extension"/>
-		<plugin id="org.eclipse.team.genericeditor.diff.extension.source"/>
-		<plugin id="org.eclipse.team.ui"/>
-		<plugin id="org.eclipse.team.ui.source"/>
-		<plugin id="org.eclipse.text"/>
-		<plugin id="org.eclipse.text.quicksearch"/>
-		<plugin id="org.eclipse.text.quicksearch.source"/>
-		<plugin id="org.eclipse.text.source"/>
-		<plugin id="org.eclipse.tools.layout.spy"/>
-		<plugin id="org.eclipse.tools.layout.spy.source"/>
-		<plugin id="org.eclipse.ui"/>
-		<plugin id="org.eclipse.ui.browser"/>
-		<plugin id="org.eclipse.ui.browser.source"/>
-		<plugin id="org.eclipse.ui.cheatsheets"/>
-		<plugin id="org.eclipse.ui.cheatsheets.source"/>
-		<plugin id="org.eclipse.ui.console"/>
-		<plugin id="org.eclipse.ui.console.source"/>
-		<plugin id="org.eclipse.ui.editors"/>
-		<plugin id="org.eclipse.ui.editors.source"/>
-		<plugin id="org.eclipse.ui.externaltools"/>
-		<plugin id="org.eclipse.ui.externaltools.source"/>
-		<plugin id="org.eclipse.ui.forms"/>
-		<plugin id="org.eclipse.ui.forms.source"/>
-		<plugin id="org.eclipse.ui.genericeditor"/>
-		<plugin id="org.eclipse.ui.genericeditor.source"/>
-		<plugin id="org.eclipse.ui.ide"/>
-		<plugin id="org.eclipse.ui.ide.application"/>
-		<plugin id="org.eclipse.ui.ide.application.source"/>
-		<plugin id="org.eclipse.ui.ide.source"/>
-		<plugin id="org.eclipse.ui.intro"/>
-		<plugin id="org.eclipse.ui.intro.quicklinks"/>
-		<plugin id="org.eclipse.ui.intro.quicklinks.source"/>
-		<plugin id="org.eclipse.ui.intro.source"/>
-		<plugin id="org.eclipse.ui.intro.universal"/>
-		<plugin id="org.eclipse.ui.intro.universal.source"/>
-		<plugin id="org.eclipse.ui.monitoring"/>
-		<plugin id="org.eclipse.ui.monitoring.source"/>
-		<plugin id="org.eclipse.ui.navigator"/>
-		<plugin id="org.eclipse.ui.navigator.resources"/>
-		<plugin id="org.eclipse.ui.navigator.resources.source"/>
-		<plugin id="org.eclipse.ui.navigator.source"/>
-		<plugin id="org.eclipse.ui.net"/>
-		<plugin id="org.eclipse.ui.net.source"/>
-		<plugin id="org.eclipse.ui.source"/>
-		<plugin id="org.eclipse.ui.themes"/>
-		<plugin id="org.eclipse.ui.themes.source"/>
-		<plugin id="org.eclipse.ui.trace"/>
-		<plugin id="org.eclipse.ui.trace.source"/>
-		<plugin id="org.eclipse.ui.views"/>
-		<plugin id="org.eclipse.ui.views.log"/>
-		<plugin id="org.eclipse.ui.views.log.source"/>
-		<plugin id="org.eclipse.ui.views.properties.tabbed"/>
-		<plugin id="org.eclipse.ui.views.properties.tabbed.source"/>
-		<plugin id="org.eclipse.ui.views.source"/>
-		<plugin id="org.eclipse.ui.win32"/>
-		<plugin id="org.eclipse.ui.win32.source"/>
-		<plugin id="org.eclipse.ui.workbench"/>
-		<plugin id="org.eclipse.ui.workbench.source"/>
-		<plugin id="org.eclipse.ui.workbench.texteditor"/>
-		<plugin id="org.eclipse.ui.workbench.texteditor.source"/>
-		<plugin id="org.eclipse.update.configurator"/>
-		<plugin id="org.eclipse.update.configurator.source"/>
-		<plugin id="org.eclipse.urischeme"/>
-		<plugin id="org.eclipse.urischeme.source"/>
-		<plugin id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
-		<plugin id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
-		<plugin id="org.jdom"/>
-		<plugin id="org.jdom.source"/>
-		<plugin id="org.json"/>
-		<plugin id="org.junit" version="4.13.2.v20211018-1956"/>
-		<plugin id="org.junit.jupiter.api"/>
-		<plugin id="org.junit.jupiter.api.source"/>
-		<plugin id="org.junit.jupiter.engine"/>
-		<plugin id="org.junit.jupiter.engine.source"/>
-		<plugin id="org.junit.jupiter.migrationsupport"/>
-		<plugin id="org.junit.jupiter.migrationsupport.source"/>
-		<plugin id="org.junit.jupiter.params"/>
-		<plugin id="org.junit.jupiter.params.source"/>
-		<plugin id="org.junit.platform.commons"/>
-		<plugin id="org.junit.platform.commons.source"/>
-		<plugin id="org.junit.platform.engine"/>
-		<plugin id="org.junit.platform.engine.source"/>
-		<plugin id="org.junit.platform.launcher"/>
-		<plugin id="org.junit.platform.launcher.source"/>
-		<plugin id="org.junit.platform.runner"/>
-		<plugin id="org.junit.platform.runner.source"/>
-		<plugin id="org.junit.platform.suite.api"/>
-		<plugin id="org.junit.platform.suite.api.source"/>
-		<plugin id="org.junit.platform.suite.commons"/>
-		<plugin id="org.junit.platform.suite.commons.source"/>
-		<plugin id="org.junit.platform.suite.engine"/>
-		<plugin id="org.junit.platform.suite.engine.source"/>
-		<plugin id="org.junit.source" version="4.13.2.v20211018-1956"/>
-		<plugin id="org.junit.vintage.engine"/>
-		<plugin id="org.junit.vintage.engine.source"/>
-		<plugin id="org.objectweb.asm" version="9.5"/>
-		<plugin id="org.objectweb.asm.source" version="9.5.0"/>
-		<plugin id="org.objectweb.asm.tree" version="9.5"/>
-		<plugin id="org.objectweb.asm.tree.source" version="9.5.0"/>
-		<plugin id="org.opentest4j" version="1.2.0.v20211018-1956"/>
-		<plugin id="org.opentest4j.source" version="1.2.0.v20211018-1956"/>
-		<plugin id="org.sat4j.core" version="2.3.6.v20201214"/>
-		<plugin id="org.sat4j.pb" version="2.3.6.v20201214"/>
-		<plugin id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
-		<plugin id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
-		<plugin id="org.slf4j.binding.log4j12" version="1.7.30.v20221112-0806"/>
-		<plugin id="org.slf4j.binding.log4j12.source" version="1.7.30.v20221112-0806"/>
-		<plugin id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
-		<plugin id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/>
-		<plugin id="org.w3c.css.sac"/>
-		<plugin id="org.w3c.css.sac.source"/>
-		<plugin id="org.w3c.dom.events"/>
-		<plugin id="org.w3c.dom.events.source"/>
-		<plugin id="org.w3c.dom.smil"/>
-		<plugin id="org.w3c.dom.smil.source"/>
-		<plugin id="org.w3c.dom.svg"/>
-		<plugin id="org.w3c.dom.svg.source"/>
-		<plugin id="org.xbill.dns"/>
-		<plugin id="org.xbill.dns.source"/>
-	</includeBundles>
 </target>
\ No newline at end of file
diff --git a/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/META-INF/MANIFEST.MF
index 044e8b63ab..340116d46e 100644
--- a/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/META-INF/MANIFEST.MF
+++ b/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.tests.apache.httpclient.server
 Automatic-Module-Name: org.eclipse.ecf.tests.apache.httpclient.server
-Bundle-Version: 3.0.101.qualifier
+Bundle-Version: 3.0.102.qualifier
 Bundle-Vendor: %plugin.provider
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Import-Package: org.osgi.framework;version="1.3.0"
@@ -11,6 +11,6 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: org.junit;bundle-version="3.8.2",
  org.apache.commons.httpclient;bundle-version="3.0.1",
  org.apache.commons.logging;bundle-version="1.0.4",
- org.apache.commons.codec;bundle-version="1.2.0"
+ org.apache.commons.commons-codec;bundle-version="1.2.0"
 Bundle-Localization: plugin
 Export-Package: org.apache.commons.httpclient.server
diff --git a/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/pom.xml b/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/pom.xml
index a71eddda81..db372f53f0 100644
--- a/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/pom.xml
+++ b/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.tests.apache.httpclient.server</artifactId>
-  <version>3.0.101-SNAPSHOT</version>
+  <version>3.0.102-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>