Fix HttpClientProxyCredentialProvider.getPasswordAuthentication

Ensure that httpclientjava's HttpClientProxyCredentialProvider.getCredentials(AuthScope) is called with a correct AuthScope from getPasswordAuthentication. Also update some target platform dependencies for the 2022-03 target to use the most recently released versions of client5/core5. Focus particularly on what is required by the httpclient5 feature because that's pulled into p2 and hence almost all installations, e.g., it does not need to include org.apache.commons.logging and should use the latest org.apache.commons.commons-codec rather than org.apache.commons.codec. eclipse#76 eclipse#77
merks · Nov 14, 2023 · d4b15ae · d4b15ae
1 parent bbf5ffa
commit d4b15ae
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 628 deletions.
diff --git a/...ndles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.xmlrpc.zeroconf.product b/...ndles/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
@@ -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/.../ecf/internal/provider/filetransfer/httpclientjava/HttpClientProxyCredentialProvider.java b/.../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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"/>