You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2017/11/27 09:36:45 UTC
httpcomponents-client git commit: HttpClient 4.5.4 release
Repository: httpcomponents-client
Updated Branches:
refs/heads/4.5.x 721618c24 -> cd166a737
Updated Tags: refs/tags/4.5.4-RC1 [created] 237f1de21
HttpClient 4.5.4 release
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/cd166a73
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/cd166a73
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/cd166a73
Branch: refs/heads/4.5.x
Commit: cd166a737cd3f61ba0022012e2a02dd93e22110b
Parents: 721618c
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Mon Nov 27 10:36:12 2017 +0100
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Mon Nov 27 10:36:12 2017 +0100
----------------------------------------------------------------------
fluent-hc/pom.xml | 2 +-
httpclient-cache/pom.xml | 2 +-
httpclient-osgi/pom.xml | 2 +-
httpclient-win/pom.xml | 2 +-
httpclient/pom.xml | 2 +-
.../entity/DeflateInputStreamFactory.java | 126 +++++++++---------
.../client/entity/GZIPInputStreamFactory.java | 128 +++++++++----------
.../apache/http/conn/ssl/TrustAllStrategy.java | 96 +++++++-------
.../http/impl/auth/CredSspSchemeFactory.java | 88 ++++++-------
httpmime/pom.xml | 2 +-
pom.xml | 4 +-
11 files changed, 227 insertions(+), 227 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/cd166a73/fluent-hc/pom.xml
----------------------------------------------------------------------
diff --git a/fluent-hc/pom.xml b/fluent-hc/pom.xml
index 1f2f217..82c9c65 100644
--- a/fluent-hc/pom.xml
+++ b/fluent-hc/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.5.4-SNAPSHOT</version>
+ <version>4.5.4</version>
</parent>
<artifactId>fluent-hc</artifactId>
<name>Apache HttpClient Fluent API</name>
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/cd166a73/httpclient-cache/pom.xml
----------------------------------------------------------------------
diff --git a/httpclient-cache/pom.xml b/httpclient-cache/pom.xml
index 1f4ffad..8f24946 100644
--- a/httpclient-cache/pom.xml
+++ b/httpclient-cache/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.5.4-SNAPSHOT</version>
+ <version>4.5.4</version>
</parent>
<artifactId>httpclient-cache</artifactId>
<name>Apache HttpClient Cache</name>
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/cd166a73/httpclient-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/httpclient-osgi/pom.xml b/httpclient-osgi/pom.xml
index 78f97ec..10f0d6d 100644
--- a/httpclient-osgi/pom.xml
+++ b/httpclient-osgi/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.5.4-SNAPSHOT</version>
+ <version>4.5.4</version>
</parent>
<artifactId>httpclient-osgi</artifactId>
<name>Apache HttpClient OSGi bundle</name>
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/cd166a73/httpclient-win/pom.xml
----------------------------------------------------------------------
diff --git a/httpclient-win/pom.xml b/httpclient-win/pom.xml
index a87ac87..3e63211 100644
--- a/httpclient-win/pom.xml
+++ b/httpclient-win/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.5.4-SNAPSHOT</version>
+ <version>4.5.4</version>
</parent>
<artifactId>httpclient-win</artifactId>
<name>Apache HttpClient Windows features</name>
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/cd166a73/httpclient/pom.xml
----------------------------------------------------------------------
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
index 3a6b0c8..565285c 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.5.4-SNAPSHOT</version>
+ <version>4.5.4</version>
</parent>
<artifactId>httpclient</artifactId>
<name>Apache HttpClient</name>
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/cd166a73/httpclient/src/main/java/org/apache/http/client/entity/DeflateInputStreamFactory.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/client/entity/DeflateInputStreamFactory.java b/httpclient/src/main/java/org/apache/http/client/entity/DeflateInputStreamFactory.java
index 3853efe..dfdefda 100644
--- a/httpclient/src/main/java/org/apache/http/client/entity/DeflateInputStreamFactory.java
+++ b/httpclient/src/main/java/org/apache/http/client/entity/DeflateInputStreamFactory.java
@@ -1,63 +1,63 @@
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package org.apache.http.client.entity;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.http.annotation.Contract;
-import org.apache.http.annotation.ThreadingBehavior;
-
-/**
- * {@link InputStreamFactory} for handling Deflate Content Coded responses.
- *
- * @since 4.5.4
- */
-@Contract(threading = ThreadingBehavior.IMMUTABLE)
-public class DeflateInputStreamFactory implements InputStreamFactory {
-
- /**
- * Singleton instance.
- */
- private static final DeflateInputStreamFactory INSTANCE = new DeflateInputStreamFactory();
-
- /**
- * Gets the singleton instance.
- *
- * @return the singleton instance.
- */
- public static DeflateInputStreamFactory getInstance() {
- return INSTANCE;
- }
-
- @Override
- public InputStream create(final InputStream inputStream) throws IOException {
- return new DeflateInputStream(inputStream);
- }
-
-}
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.client.entity;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
+
+/**
+ * {@link InputStreamFactory} for handling Deflate Content Coded responses.
+ *
+ * @since 4.5.4
+ */
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
+public class DeflateInputStreamFactory implements InputStreamFactory {
+
+ /**
+ * Singleton instance.
+ */
+ private static final DeflateInputStreamFactory INSTANCE = new DeflateInputStreamFactory();
+
+ /**
+ * Gets the singleton instance.
+ *
+ * @return the singleton instance.
+ */
+ public static DeflateInputStreamFactory getInstance() {
+ return INSTANCE;
+ }
+
+ @Override
+ public InputStream create(final InputStream inputStream) throws IOException {
+ return new DeflateInputStream(inputStream);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/cd166a73/httpclient/src/main/java/org/apache/http/client/entity/GZIPInputStreamFactory.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/client/entity/GZIPInputStreamFactory.java b/httpclient/src/main/java/org/apache/http/client/entity/GZIPInputStreamFactory.java
index f52fd12..787b937 100644
--- a/httpclient/src/main/java/org/apache/http/client/entity/GZIPInputStreamFactory.java
+++ b/httpclient/src/main/java/org/apache/http/client/entity/GZIPInputStreamFactory.java
@@ -1,64 +1,64 @@
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package org.apache.http.client.entity;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.GZIPInputStream;
-
-import org.apache.http.annotation.Contract;
-import org.apache.http.annotation.ThreadingBehavior;
-
-/**
- * {@link InputStreamFactory} for handling GZIPContent Coded responses.
- *
- * @since 4.5.4
- */
-@Contract(threading = ThreadingBehavior.IMMUTABLE)
-public class GZIPInputStreamFactory implements InputStreamFactory {
-
- /**
- * Singleton instance.
- */
- private static final GZIPInputStreamFactory INSTANCE = new GZIPInputStreamFactory();
-
- /**
- * Gets the singleton instance.
- *
- * @return the singleton instance.
- */
- public static GZIPInputStreamFactory getInstance() {
- return INSTANCE;
- }
-
- @Override
- public InputStream create(final InputStream inputStream) throws IOException {
- return new GZIPInputStream(inputStream);
- }
-
-}
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.client.entity;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
+
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
+
+/**
+ * {@link InputStreamFactory} for handling GZIPContent Coded responses.
+ *
+ * @since 4.5.4
+ */
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
+public class GZIPInputStreamFactory implements InputStreamFactory {
+
+ /**
+ * Singleton instance.
+ */
+ private static final GZIPInputStreamFactory INSTANCE = new GZIPInputStreamFactory();
+
+ /**
+ * Gets the singleton instance.
+ *
+ * @return the singleton instance.
+ */
+ public static GZIPInputStreamFactory getInstance() {
+ return INSTANCE;
+ }
+
+ @Override
+ public InputStream create(final InputStream inputStream) throws IOException {
+ return new GZIPInputStream(inputStream);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/cd166a73/httpclient/src/main/java/org/apache/http/conn/ssl/TrustAllStrategy.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/conn/ssl/TrustAllStrategy.java b/httpclient/src/main/java/org/apache/http/conn/ssl/TrustAllStrategy.java
index d492404..3857f53 100644
--- a/httpclient/src/main/java/org/apache/http/conn/ssl/TrustAllStrategy.java
+++ b/httpclient/src/main/java/org/apache/http/conn/ssl/TrustAllStrategy.java
@@ -1,48 +1,48 @@
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-package org.apache.http.conn.ssl;
-
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-/**
- * A trust strategy that accepts all certificates as trusted. Verification of
- * all other certificates is done by the trust manager configured in the SSL
- * context.
- *
- * @since 4.5.4
- */
-public class TrustAllStrategy implements TrustStrategy {
-
- public static final TrustAllStrategy INSTANCE = new TrustAllStrategy();
-
- @Override
- public boolean isTrusted(final X509Certificate[] chain, final String authType) throws CertificateException {
- return true;
- }
-
-}
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+package org.apache.http.conn.ssl;
+
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+/**
+ * A trust strategy that accepts all certificates as trusted. Verification of
+ * all other certificates is done by the trust manager configured in the SSL
+ * context.
+ *
+ * @since 4.5.4
+ */
+public class TrustAllStrategy implements TrustStrategy {
+
+ public static final TrustAllStrategy INSTANCE = new TrustAllStrategy();
+
+ @Override
+ public boolean isTrusted(final X509Certificate[] chain, final String authType) throws CertificateException {
+ return true;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/cd166a73/httpclient/src/main/java/org/apache/http/impl/auth/CredSspSchemeFactory.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/CredSspSchemeFactory.java b/httpclient/src/main/java/org/apache/http/impl/auth/CredSspSchemeFactory.java
index 309101b..3953b57 100644
--- a/httpclient/src/main/java/org/apache/http/impl/auth/CredSspSchemeFactory.java
+++ b/httpclient/src/main/java/org/apache/http/impl/auth/CredSspSchemeFactory.java
@@ -1,44 +1,44 @@
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package org.apache.http.impl.auth;
-
-
-import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.AuthSchemeProvider;
-import org.apache.http.protocol.HttpContext;
-
-
-public class CredSspSchemeFactory implements AuthSchemeProvider
-{
-
- @Override
- public AuthScheme create( final HttpContext context )
- {
- return new CredSspScheme();
- }
-}
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.impl.auth;
+
+
+import org.apache.http.auth.AuthScheme;
+import org.apache.http.auth.AuthSchemeProvider;
+import org.apache.http.protocol.HttpContext;
+
+
+public class CredSspSchemeFactory implements AuthSchemeProvider
+{
+
+ @Override
+ public AuthScheme create( final HttpContext context )
+ {
+ return new CredSspScheme();
+ }
+}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/cd166a73/httpmime/pom.xml
----------------------------------------------------------------------
diff --git a/httpmime/pom.xml b/httpmime/pom.xml
index 8130d92..37b9b38 100644
--- a/httpmime/pom.xml
+++ b/httpmime/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.5.4-SNAPSHOT</version>
+ <version>4.5.4</version>
</parent>
<artifactId>httpmime</artifactId>
<name>Apache HttpClient Mime</name>
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/cd166a73/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2951041..8c554ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>httpcomponents-client</artifactId>
<name>Apache HttpComponents Client</name>
- <version>4.5.4-SNAPSHOT</version>
+ <version>4.5.4</version>
<description>Apache HttpComponents Client is a library of components for building client side HTTP services</description>
<url>http://hc.apache.org/httpcomponents-client-ga/</url>
<inceptionYear>1999</inceptionYear>
@@ -61,7 +61,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/httpcomponents-client.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/httpcomponents-client.git</developerConnection>
<url>https://github.com/apache/httpcomponents-client/tree/${project.scm.tag}</url>
- <tag>4.5.x</tag>
+ <tag>4.5.4</tag>
</scm>
<properties>