From dad1325aaa20c8982bf863cc0e4320e38a614ea5 Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Tue, 9 Jul 2024 10:44:59 +0200
Subject: [PATCH] Ensure that ECF builds with latest httpclient5 dependencies

- Use org.apache.commons.commons-logging when possible.

https://github.com/eclipse-simrel/simrel.build/issues/438
---
 .../ExampleOSGIAsyncConsumer.generic.product       |  4 ++--
 .../launch/ExampleOSGiAsync.generic.product        |  4 ++--
 .../TimeServiceConsumer.xmlrpc.zeroconf.product    |  2 +-
 .../TimeServiceConsumer.xmlrpc.zeroconf.product    |  2 +-
 .../launch/TimeServiceHost.xmlrpc.zeroconf.product |  4 ++--
 .../feature.xml                                    |  2 +-
 .../feature.xml                                    |  1 +
 .../feature.xml                                    |  2 +-
 .../ecf-2024-06.target                             | 14 +++++++-------
 releng/org.eclipse.ecf.releng/ECF.setup            | 10 +++++++++-
 .../META-INF/MANIFEST.MF                           |  2 +-
 11 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/examples/bundles/com.mycorp.examples.osgi.async.consumer/launch/ExampleOSGIAsyncConsumer.generic.product b/examples/bundles/com.mycorp.examples.osgi.async.consumer/launch/ExampleOSGIAsyncConsumer.generic.product
index ba382244e..94fabfb84 100644
--- a/examples/bundles/com.mycorp.examples.osgi.async.consumer/launch/ExampleOSGIAsyncConsumer.generic.product
+++ b/examples/bundles/com.mycorp.examples.osgi.async.consumer/launch/ExampleOSGIAsyncConsumer.generic.product
@@ -29,7 +29,7 @@
       <plugin id="com.mycorp.examples.osgi.async"/>
       <plugin id="com.mycorp.examples.osgi.async.consumer"/>
       <plugin id="jakarta.servlet.jsp-api"/>
-      <plugin id="org.apache.commons.logging"/>
+      <plugin id="org.apache.commons.commons-logging"/>
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>
       <plugin id="org.apache.felix.gogo.shell"/>
@@ -61,7 +61,7 @@
 
    <configurations>
       <plugin id="javax.servlet" autoStart="false" startLevel="0" />
-      <plugin id="org.apache.commons.logging" autoStart="false" startLevel="0" />
+      <plugin id="org.apache.commons.commons-logging" autoStart="false" startLevel="0" />
       <plugin id="org.apache.felix.gogo.command" autoStart="false" startLevel="0" />
       <plugin id="org.apache.felix.gogo.runtime" autoStart="false" startLevel="0" />
       <plugin id="org.apache.felix.gogo.shell" autoStart="false" startLevel="0" />
diff --git a/examples/bundles/com.mycorp.examples.osgi.async.impl/launch/ExampleOSGiAsync.generic.product b/examples/bundles/com.mycorp.examples.osgi.async.impl/launch/ExampleOSGiAsync.generic.product
index 7e1224c46..0c8a9d393 100644
--- a/examples/bundles/com.mycorp.examples.osgi.async.impl/launch/ExampleOSGiAsync.generic.product
+++ b/examples/bundles/com.mycorp.examples.osgi.async.impl/launch/ExampleOSGiAsync.generic.product
@@ -28,7 +28,7 @@
    <plugins>
       <plugin id="com.mycorp.examples.osgi.async"/>
       <plugin id="com.mycorp.examples.osgi.async.impl"/>
-      <plugin id="org.apache.commons.logging"/>
+      <plugin id="org.apache.commons.commons-logging"/>
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>
       <plugin id="org.apache.felix.gogo.shell"/>
@@ -78,7 +78,7 @@
 
    <configurations>
       <plugin id="javax.servlet" autoStart="false" startLevel="0" />
-      <plugin id="org.apache.commons.logging" autoStart="false" startLevel="0" />
+      <plugin id="org.apache.commons.commons-logging" autoStart="false" startLevel="0" />
       <plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
       <plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
       <plugin id="org.apache.felix.gogo.shell" autoStart="true" startLevel="0" />
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
index 8935bcbdf..4d476274a 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds.async/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
@@ -31,7 +31,7 @@
       <plugin id="com.mycorp.examples.timeservice.async"/>
       <plugin id="com.mycorp.examples.timeservice.consumer.ds.async"/>
       <plugin id="jakarta.servlet.jsp-api"/>
-      <plugin id="org.apache.commons.logging"/>
+      <plugin id="org.apache.commons.commons-logging"/>
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>
       <plugin id="org.apache.felix.gogo.shell"/>
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
index acd1f8091..dba844cc6 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.xmlrpc.zeroconf.product
@@ -31,7 +31,7 @@
       <plugin id="com.mycorp.examples.timeservice.async"/>
       <plugin id="com.mycorp.examples.timeservice.consumer.ds"/>
       <plugin id="jakarta.servlet.jsp-api"/>
-      <plugin id="org.apache.commons.logging"/>
+      <plugin id="org.apache.commons.commons-logging"/>
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>
       <plugin id="org.apache.felix.gogo.shell"/>
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 53e757607..0ba960fe2 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
@@ -38,7 +38,7 @@
       <plugin id="com.mycorp.examples.timeservice.host"/>
       <plugin id="jakarta.servlet.jsp-api"/>
       <plugin id="org.apache.commons.commons-codec"/>
-      <plugin id="org.apache.commons.logging"/>
+      <plugin id="org.apache.commons.commons-logging"/>
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>
       <plugin id="org.apache.felix.gogo.shell"/>
@@ -87,7 +87,7 @@
       <plugin id="com.mycorp.examples.timeservice.host" autoStart="true" startLevel="0" />
       <plugin id="javax.servlet" 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.commons.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" />
       <plugin id="org.apache.felix.gogo.shell" autoStart="true" startLevel="0" />
diff --git a/examples/bundles/org.eclipse.ecf.example.twitter.client/feature.xml b/examples/bundles/org.eclipse.ecf.example.twitter.client/feature.xml
index ec0867010..2008adf05 100644
--- a/examples/bundles/org.eclipse.ecf.example.twitter.client/feature.xml
+++ b/examples/bundles/org.eclipse.ecf.example.twitter.client/feature.xml
@@ -366,7 +366,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.logging"
+         id="org.apache.commons.commons-logging"
          download-size="0"
          install-size="0"
          version="0.0.0"
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 1e3002d6a..e2952c218 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
@@ -45,6 +45,7 @@
          version="0.0.0"
          unpack="false"/>
 
+   <!-- required by org.apache.httpcomponents.httpclient -->
    <plugin
          id="org.apache.commons.logging"
          download-size="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 095dcae4c..3f1cc8396 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
@@ -25,7 +25,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.commons-codec" version="1.6" match="compatible"/>
-      <import plugin="org.apache.commons.logging" version="1.2.0" match="compatible"/>
+      <import plugin="org.apache.commons.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"/>
       <import plugin="json"/>
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-2024-06.target b/releng/org.eclipse.ecf.releng.target/ecf-2024-06.target
index c1c02033f..dbdf19b35 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-2024-06.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-2024-06.target
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Generated from ECF" sequenceNumber="1">
+<target name="Generated from ECF" sequenceNumber="2">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
       <repository location="https://download.eclipse.org/cbi/updates/license"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+      <unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.databinding.edit.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
@@ -25,17 +26,14 @@
       <unit id="jakarta.servlet-api" version="0.0.0"/>
       <unit id="jakarta.xml.bind-api" version="0.0.0"/>
       <unit id="json" version="0.0.0"/>
-      <unit id="junit-jupiter-migrationsupport" version="0.0.0"/>
-      <unit id="junit-jupiter-params" version="0.0.0"/>
-      <unit id="junit-platform-runner" version="0.0.0"/>
-      <unit id="junit-platform-suite-engine" version="0.0.0"/>
-      <unit id="junit-vintage-engine" version="0.0.0"/>
       <unit id="org.apache.ant" version="0.0.0"/>
       <unit id="org.apache.batik.css" version="0.0.0"/>
+      <unit id="org.apache.commons.commons-logging" version="0.0.0"/>
       <unit id="org.apache.commons.httpclient" version="0.0.0"/>
       <unit id="org.apache.commons.jxpath" version="0.0.0"/>
       <unit id="org.apache.felix.gogo.runtime" version="0.0.0"/>
       <unit id="org.apache.httpcomponents.client5.httpclient5" version="0.0.0"/>
+      <unit id="org.apache.httpcomponents.client5.httpclient5-win" version="0.0.0"/>
       <unit id="org.apache.httpcomponents.httpclient" version="0.0.0"/>
       <unit id="org.apache.httpcomponents.httpclient.win" version="0.0.0"/>
       <unit id="org.apache.log4j" version="0.0.0"/>
@@ -44,6 +42,8 @@
       <unit id="org.bndtools.headless.build.plugin.gradle" version="0.0.0"/>
       <unit id="org.bndtools.templates.template" version="0.0.0"/>
       <unit id="org.bndtools.templating" version="0.0.0"/>
+      <unit id="org.junit" version="0.0.0"/>
+      <unit id="org.opentest4j" version="0.0.0"/>
       <unit id="org.osgi.annotation.bundle" version="0.0.0"/>
       <unit id="org.osgi.annotation.versioning" version="0.0.0"/>
       <unit id="org.osgi.namespace.contract" version="0.0.0"/>
@@ -64,7 +64,7 @@
       <unit id="org.sat4j.pb" version="0.0.0"/>
       <unit id="org.tukaani.xz" version="0.0.0"/>
       <unit id="org.xbill.dns" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.ecf.releng/ECF.setup b/releng/org.eclipse.ecf.releng/ECF.setup
index 47211b213..ba944e0e3 100644
--- a/releng/org.eclipse.ecf.releng/ECF.setup
+++ b/releng/org.eclipse.ecf.releng/ECF.setup
@@ -138,7 +138,7 @@
         </detail>
         <detail
             key="extraUnits">
-          <value>org.apache.log4j,jakarta.servlet-api,org.eclipse.equinox.core.feature.feature.group,org.apache.httpcomponents.httpclient.win</value>
+          <value>org.apache.log4j,jakarta.servlet-api,org.eclipse.equinox.core.feature.feature.group,org.apache.httpcomponents.httpclient.win,org.apache.httpcomponents.client5.httpclient5-win,org.apache.commons.commons-logging</value>
         </detail>
         <detail
             key="singleLocation">
@@ -298,6 +298,14 @@
           name="*"/>
       <requirement
           name="org.eclipse.sdk.feature.group"/>
+      <requirement
+          name="org.apache.httpcomponents.httpclient.win"
+          optional="true"/>
+      <requirement
+          name="org.apache.httpcomponents.client5.httpclient5-win"
+          optional="true"/>
+      <requirement
+          name="org.apache.commons.commons-logging"/>
       <requirement
           name="org.apache.commons.jxpath"
           versionRange="[1.3.0.v200911051830,1.3.0.v200911051830]"
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 340116d46..9654755f0 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
@@ -10,7 +10,7 @@ Import-Package: org.osgi.framework;version="1.3.0"
 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.commons-logging;bundle-version="1.0.4",
  org.apache.commons.commons-codec;bundle-version="1.2.0"
 Bundle-Localization: plugin
 Export-Package: org.apache.commons.httpclient.server