Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-1623: Several files still refer to Java 1.5 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1662569 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Osipov 2015-02-26 20:59:56 +00:00
parent a0b31445af
commit fc250e5616
10 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.txt
View File

@ -11,7 +11,7 @@ For building from source instructions please refer to BUILDING.txt.
Dependencies
------------
HttpClient main module requires Java 5.0 compatible runtime and
HttpClient main module requires Java 6 compatible runtime and
depends on the following external libraries:
* Apache HttpComponents HttpCore
@ -20,7 +20,7 @@ depends on the following external libraries:
(for detailed information on external dependencies please see pom.xml)
HttpMime module is optional and requires Java 5.0 compatible runtime
HttpMime module is optional and requires Java 6 compatible runtime
and depends on the following external libraries:
* Apache HttpComponents HttpCore

2
fluent-hc/pom.xml
View File

@ -94,7 +94,7 @@
<quiet>true</quiet>
<source>${maven.compiler.source}</source>
<links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
<link>http://docs.oracle.com/javase/6/docs/api/</link>
<link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
<link>http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/</link>
</links>

2
httpclient-cache/pom.xml
View File

@ -153,7 +153,7 @@
<quiet>true</quiet>
<source>${maven.compiler.source}</source>
<links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
<link>http://docs.oracle.com/javase/6/docs/api/</link>
<link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
<link>http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/</link>
</links>

2
httpclient-win/pom.xml
View File

@ -80,7 +80,7 @@
<quiet>true</quiet>
<source>${maven.compiler.source}</source>
<links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
<link>http://docs.oracle.com/javase/6/docs/api/</link>
<link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
</links>
</configuration>

2
httpclient/pom.xml
View File

@ -139,7 +139,7 @@
<quiet>true</quiet>
<source>${maven.compiler.source}</source>
<links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
<link>http://docs.oracle.com/javase/6/docs/api/</link>
<link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
</links>
</configuration>

5
httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java
View File

@ -182,9 +182,8 @@ public class SSLConnectionSocketFactory implements LayeredConnectionSocketFactor
/**
* Obtains default SSL socket factory with an SSL context based on system properties
* as described in
* <a href="http://docs.oracle.com/javase/1.5.0/docs/guide/security/jsse/JSSERefGuide.html">
* "JavaTM Secure Socket Extension (JSSE) Reference Guide for the JavaTM 2 Platform
* Standard Edition 5</a>
* <a href="http://docs.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html">
* Java&#x2122; Secure Socket Extension (JSSE) Reference Guide</a>.
*
* @return default system SSL socket factory
*/

5
httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java
View File

@ -33,9 +33,8 @@ import org.apache.http.annotation.Immutable;
/**
* The Strict HostnameVerifier works the same way as Sun Java 1.4, Sun
* Java 5, Sun Java 6-rc. It's also pretty close to IE6. This
* implementation appears to be compliant with RFC 2818 for dealing with
* wildcards.
* Java 5, Sun Java 6. It's also pretty close to IE6. This implementation
* appears to be compliant with RFC 2818 for dealing with wildcards.
* <p>
* The hostname must match either the first CN, or any of the subject-alts.
* A wildcard can occur in the CN, and in any of the subject-alts. The

13
httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
View File

@ -554,19 +554,6 @@ final class NTLMEngineImpl implements NTLMEngine {
static byte[] ntlm2SessionResponse(final byte[] ntlmHash, final byte[] challenge,
final byte[] clientChallenge) throws NTLMEngineException {
try {
// Look up MD5 algorithm (was necessary on jdk 1.4.2)
// This used to be needed, but java 1.5.0_07 includes the MD5
// algorithm (finally)
// Class x = Class.forName("gnu.crypto.hash.MD5");
// Method updateMethod = x.getMethod("update",new
// Class[]{byte[].class});
// Method digestMethod = x.getMethod("digest",new Class[0]);
// Object mdInstance = x.newInstance();
// updateMethod.invoke(mdInstance,new Object[]{challenge});
// updateMethod.invoke(mdInstance,new Object[]{clientChallenge});
// byte[] digest = (byte[])digestMethod.invoke(mdInstance,new
// Object[0]);
final MessageDigest md5 = MessageDigest.getInstance("MD5");
md5.update(challenge);
md5.update(clientChallenge);

2
httpmime/pom.xml
View File

@ -103,7 +103,7 @@
<quiet>true</quiet>
<source>${maven.compiler.source}</source>
<links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
<link>http://docs.oracle.com/javase/6/docs/api/</link>
<link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
</links>
</configuration>

4
src/docbkx/connmgmt.xml
View File

@ -445,8 +445,8 @@ SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext);
a certain degree of familiarity with the concepts of the SSL/TLS protocol,
a detailed explanation of which is out of scope for this document. Please refer
to the <ulink
url="http://java.sun.com/j2se/1.5.0/docs/guide/security/jsse/JSSERefGuide.html">
Java Secure Socket Extension</ulink> for a detailed description of
url="http://docs.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html">
Java&#x2122; Secure Socket Extension (JSSE) Reference Guide</ulink> for a detailed description of
<interfacename>javax.net.ssl.SSLContext</interfacename> and related
tools.</para>
</section>