[httpcomponents-asyncclient] 05/06: Removed httpcore-ThreadSafe.patch (fixed upstream)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Nov 13 22:36:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository httpcomponents-asyncclient.
commit a819967e308c827fa0e74eb36554ef2205fc8753
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sun Nov 13 23:34:13 2016 +0100
Removed httpcore-ThreadSafe.patch (fixed upstream)
---
debian/changelog | 4 +-
debian/patches/httpcore-ThreadSafe.patch | 282 -------------------------------
debian/patches/series | 1 -
3 files changed, 3 insertions(+), 284 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5a4c063..c1e9b5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-httpcomponents-asyncclient (4.1-3) UNRELEASED; urgency=medium
+httpcomponents-asyncclient (4.1.2-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release
+ - Removed httpcore-ThreadSafe.patch (fixed upstream)
* Build with the DH sequencer instead of CDBS
* Fixed the watch file
* Switch to debhelper level 10
diff --git a/debian/patches/httpcore-ThreadSafe.patch b/debian/patches/httpcore-ThreadSafe.patch
deleted file mode 100644
index e2ea0ca..0000000
--- a/debian/patches/httpcore-ThreadSafe.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Thu, 14 Jul 2016 19:10:24 +0200
-Subject: httpcore-ThreadSafe
-
-Debian-Bug: https://bugs.debian.org/828822
-Forwarded: no
----
- .../org/apache/http/impl/client/cache/CachingHttpAsyncClient.java | 5 +++--
- .../org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java | 5 +++--
- .../org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java | 5 +++--
- .../apache/http/impl/nio/client/CloseableHttpPipeliningClient.java | 5 +++--
- .../apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java | 5 +++--
- .../java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java | 2 --
- .../main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java | 5 +++--
- .../apache/http/impl/nio/client/MinimalHttpAsyncClientBuilder.java | 2 --
- .../src/main/java/org/apache/http/impl/nio/conn/CPool.java | 5 +++--
- .../src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java | 5 +++--
- .../src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java | 2 --
- .../http/impl/nio/conn/PoolingNHttpClientConnectionManager.java | 5 +++--
- 12 files changed, 27 insertions(+), 24 deletions(-)
-
-diff --git a/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java b/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
-index 9f2e425..136b3ae 100644
---- a/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
-+++ b/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
-@@ -48,7 +48,8 @@ import org.apache.http.HttpVersion;
- import org.apache.http.ProtocolException;
- import org.apache.http.ProtocolVersion;
- import org.apache.http.RequestLine;
--import org.apache.http.annotation.ThreadSafe;
-+import org.apache.http.annotation.ThreadingBehavior;
-+import org.apache.http.annotation.Contract;
- import org.apache.http.client.ClientProtocolException;
- import org.apache.http.client.cache.CacheResponseStatus;
- import org.apache.http.client.cache.HeaderConstants;
-@@ -76,7 +77,7 @@ import org.apache.http.util.Args;
- import org.apache.http.util.EntityUtils;
- import org.apache.http.util.VersionInfo;
-
-- at ThreadSafe // So long as the responseCache implementation is threadsafe
-+ at Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) // So long as the responseCache implementation is threadsafe
- public class CachingHttpAsyncClient implements HttpAsyncClient {
-
- private final static boolean SUPPORTS_RANGE_AND_CONTENT_RANGE_HEADERS = false;
-diff --git a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java
-index 16d86d1..e356bf4 100644
---- a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java
-+++ b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java
-@@ -26,13 +26,14 @@
- */
- package org.apache.http.impl.nio.conn;
-
--import org.apache.http.annotation.ThreadSafe;
-+import org.apache.http.annotation.ThreadingBehavior;
-+import org.apache.http.annotation.Contract;
- import org.apache.http.nio.conn.scheme.AsyncScheme;
- import org.apache.http.nio.conn.scheme.AsyncSchemeRegistry;
- import org.apache.http.nio.conn.ssl.SSLLayeringStrategy;
-
- @Deprecated
-- at ThreadSafe
-+ at Contract(threading = ThreadingBehavior.SAFE)
- public final class AsyncSchemeRegistryFactory {
-
- public static AsyncSchemeRegistry createDefault() {
-diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java
-index 33f7f5a..6409877 100644
---- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java
-+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java
-@@ -33,7 +33,8 @@ import java.util.concurrent.Future;
- import org.apache.http.HttpHost;
- import org.apache.http.HttpRequest;
- import org.apache.http.HttpResponse;
--import org.apache.http.annotation.ThreadSafe;
-+import org.apache.http.annotation.ThreadingBehavior;
-+import org.apache.http.annotation.Contract;
- import org.apache.http.client.ClientProtocolException;
- import org.apache.http.client.methods.HttpUriRequest;
- import org.apache.http.client.protocol.HttpClientContext;
-@@ -52,7 +53,7 @@ import org.apache.http.util.Args;
- *
- * @since 4.0
- */
-- at ThreadSafe
-+ at Contract(threading = ThreadingBehavior.SAFE)
- public abstract class CloseableHttpAsyncClient implements HttpAsyncClient, Closeable {
-
- public abstract boolean isRunning();
-diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpPipeliningClient.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpPipeliningClient.java
-index 71890de..d52b271 100644
---- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpPipeliningClient.java
-+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpPipeliningClient.java
-@@ -33,7 +33,8 @@ import java.util.concurrent.Future;
- import org.apache.http.HttpHost;
- import org.apache.http.HttpRequest;
- import org.apache.http.HttpResponse;
--import org.apache.http.annotation.ThreadSafe;
-+import org.apache.http.annotation.ThreadingBehavior;
-+import org.apache.http.annotation.Contract;
- import org.apache.http.client.protocol.HttpClientContext;
- import org.apache.http.concurrent.FutureCallback;
- import org.apache.http.nio.client.HttpPipeliningClient;
-@@ -49,7 +50,7 @@ import org.apache.http.util.Args;
- *
- * @since 4.1
- */
-- at ThreadSafe
-+ at Contract(threading = ThreadingBehavior.SAFE)
- public abstract class CloseableHttpPipeliningClient
- extends CloseableHttpAsyncClient implements HttpPipeliningClient {
-
-diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
-index f599fdd..a493486 100644
---- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
-+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
-@@ -27,7 +27,8 @@
- package org.apache.http.impl.nio.client;
-
- import org.apache.http.HttpConnection;
--import org.apache.http.annotation.Immutable;
-+import org.apache.http.annotation.ThreadingBehavior;
-+import org.apache.http.annotation.Contract;
- import org.apache.http.auth.AuthScheme;
- import org.apache.http.auth.AuthState;
- import org.apache.http.auth.Credentials;
-@@ -55,7 +56,7 @@ import java.security.Principal;
- *
- * @since 4.0
- */
-- at Immutable
-+ at Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
- public class DefaultAsyncUserTokenHandler implements UserTokenHandler {
-
- public static final DefaultAsyncUserTokenHandler INSTANCE = new DefaultAsyncUserTokenHandler();
-diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
-index b7e9e6e..393756c 100644
---- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
-+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
-@@ -41,7 +41,6 @@ import org.apache.http.Header;
- import org.apache.http.HttpHost;
- import org.apache.http.HttpRequestInterceptor;
- import org.apache.http.HttpResponseInterceptor;
--import org.apache.http.annotation.NotThreadSafe;
- import org.apache.http.auth.AuthSchemeProvider;
- import org.apache.http.client.AuthenticationStrategy;
- import org.apache.http.client.CookieStore;
-@@ -142,7 +141,6 @@ import org.apache.http.util.VersionInfo;
- *
- * @since 4.0
- */
-- at NotThreadSafe
- public class HttpAsyncClientBuilder {
-
- private NHttpClientConnectionManager connManager;
-diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java
-index da83c41..b9d9d55 100644
---- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java
-+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java
-@@ -27,7 +27,8 @@
-
- package org.apache.http.impl.nio.client;
-
--import org.apache.http.annotation.Immutable;
-+import org.apache.http.annotation.ThreadingBehavior;
-+import org.apache.http.annotation.Contract;
- import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
- import org.apache.http.nio.conn.NHttpClientConnectionManager;
- import org.apache.http.nio.reactor.ConnectingIOReactor;
-@@ -39,7 +40,7 @@ import org.apache.http.util.Args;
- *
- * @since 4.0
- */
-- at Immutable
-+ at Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
- public class HttpAsyncClients {
-
- private HttpAsyncClients() {
-diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClientBuilder.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClientBuilder.java
-index a865dc7..fca8c7e 100644
---- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClientBuilder.java
-+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClientBuilder.java
-@@ -31,7 +31,6 @@ import java.util.concurrent.Executors;
- import java.util.concurrent.ThreadFactory;
-
- import org.apache.http.ConnectionReuseStrategy;
--import org.apache.http.annotation.NotThreadSafe;
- import org.apache.http.client.protocol.RequestAddCookies;
- import org.apache.http.client.protocol.RequestClientConnControl;
- import org.apache.http.client.protocol.ResponseProcessCookies;
-@@ -55,7 +54,6 @@ import org.apache.http.util.VersionInfo;
- *
- * @since 4.1
- */
-- at NotThreadSafe
- class MinimalHttpAsyncClientBuilder {
-
- private NHttpClientConnectionManager connManager;
-diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java
-index eaa1e18..8283152 100644
---- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java
-+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java
-@@ -30,7 +30,8 @@ import java.util.concurrent.TimeUnit;
-
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
--import org.apache.http.annotation.ThreadSafe;
-+import org.apache.http.annotation.ThreadingBehavior;
-+import org.apache.http.annotation.Contract;
- import org.apache.http.conn.routing.HttpRoute;
- import org.apache.http.nio.NHttpClientConnection;
- import org.apache.http.nio.conn.ManagedNHttpClientConnection;
-@@ -39,7 +40,7 @@ import org.apache.http.nio.pool.NIOConnFactory;
- import org.apache.http.nio.pool.SocketAddressResolver;
- import org.apache.http.nio.reactor.ConnectingIOReactor;
-
-- at ThreadSafe
-+ at Contract(threading = ThreadingBehavior.SAFE)
- class CPool extends AbstractNIOConnPool<HttpRoute, ManagedNHttpClientConnection, CPoolEntry> {
-
- private final Log log = LogFactory.getLog(CPool.class);
-diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java
-index ffe7286..4cadd58 100644
---- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java
-+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java
-@@ -31,12 +31,13 @@ import java.util.Date;
- import java.util.concurrent.TimeUnit;
-
- import org.apache.commons.logging.Log;
--import org.apache.http.annotation.ThreadSafe;
-+import org.apache.http.annotation.ThreadingBehavior;
-+import org.apache.http.annotation.Contract;
- import org.apache.http.conn.routing.HttpRoute;
- import org.apache.http.nio.conn.ManagedNHttpClientConnection;
- import org.apache.http.pool.PoolEntry;
-
-- at ThreadSafe
-+ at Contract(threading = ThreadingBehavior.SAFE)
- class CPoolEntry extends PoolEntry<HttpRoute, ManagedNHttpClientConnection> {
-
- private final Log log;
-diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java
-index 21dd86a..e38246c 100644
---- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java
-+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java
-@@ -35,14 +35,12 @@ import org.apache.http.HttpConnectionMetrics;
- import org.apache.http.HttpException;
- import org.apache.http.HttpRequest;
- import org.apache.http.HttpResponse;
--import org.apache.http.annotation.NotThreadSafe;
- import org.apache.http.impl.conn.ConnectionShutdownException;
- import org.apache.http.nio.NHttpClientConnection;
- import org.apache.http.nio.conn.ManagedNHttpClientConnection;
- import org.apache.http.nio.reactor.IOSession;
- import org.apache.http.protocol.HttpContext;
-
-- at NotThreadSafe
- class CPoolProxy implements ManagedNHttpClientConnection {
-
- private volatile CPoolEntry poolEntry;
-diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java
-index 21b3ed8..02cb924 100644
---- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java
-+++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java
-@@ -39,7 +39,8 @@ import java.util.concurrent.TimeUnit;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.apache.http.HttpHost;
--import org.apache.http.annotation.ThreadSafe;
-+import org.apache.http.annotation.ThreadingBehavior;
-+import org.apache.http.annotation.Contract;
- import org.apache.http.concurrent.BasicFuture;
- import org.apache.http.concurrent.FutureCallback;
- import org.apache.http.config.ConnectionConfig;
-@@ -88,7 +89,7 @@ import org.apache.http.util.Asserts;
- *
- * @since 4.0
- */
-- at ThreadSafe
-+ at Contract(threading = ThreadingBehavior.SAFE)
- public class PoolingNHttpClientConnectionManager
- implements NHttpClientConnectionManager, ConnPoolControl<HttpRoute> {
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 51ae64f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-httpcore-ThreadSafe.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/httpcomponents-asyncclient.git
More information about the pkg-java-commits
mailing list