Skip to content

Commit f35c878

Browse files
author
Oleksandr Kylymnychenko
committed
Merge remote-tracking branch 'upstream/master'
2 parents 98872c9 + ea7ac40 commit f35c878

File tree

506 files changed

+24691
-15276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

506 files changed

+24691
-15276
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Async Http Client library purpose is to allow Java applications to easily execut
1010
<dependency>
1111
<groupId>com.ning</groupId>
1212
<artifactId>async-http-client</artifactId>
13-
<version>1.7.8</version>
13+
<version>1.7.16</version>
1414
</dependency>
1515
```
1616

@@ -29,7 +29,7 @@ Future<Response> f = asyncHttpClient.prepareGet("http://www.ning.com/").execute(
2929
Response r = f.get();
3030
```
3131

32-
Note that in this case all the content must be read fully in memory, even if you used `getResponseBodyAsStream()' method on returned `Response` object.
32+
Note that in this case all the content must be read fully in memory, even if you used `getResponseBodyAsStream()` method on returned `Response` object.
3333

3434
You can also accomplish asynchronous (non-blocking) operation without using a Future if you want to receive and process the response in your handler:
3535

@@ -180,3 +180,5 @@ Keep up to date on the library development by joining the Asynchronous HTTP Clie
180180
[Google Group](http://groups.google.com/group/asynchttpclient)
181181

182182
or follow us on [Twitter](http://twitter.com/jfarcand)
183+
184+
[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/6433679063b2351599c6ca44a08246a2 "githalytics.com")](http://githalytics.com/AsyncHttpClient/async-http-client)

api/pom.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<parent>
5-
<groupId>com.ning</groupId>
5+
<groupId>org.asynchttpclient</groupId>
66
<artifactId>async-http-client-project</artifactId>
7-
<version>1.8.0-SNAPSHOT</version>
7+
<version>2.0.0-SNAPSHOT</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
10-
<groupId>com.ning</groupId>
1110
<artifactId>async-http-client-api</artifactId>
1211
<name>Asynchronous Http Client API</name>
13-
<version>1.8.0-SNAPSHOT</version>
14-
<packaging>jar</packaging>
1512
<description>
1613
The Async Http Client (AHC) API classes.
1714
</description>
@@ -37,7 +34,7 @@
3734
<dependency>
3835
<groupId>org.slf4j</groupId>
3936
<artifactId>slf4j-api</artifactId>
40-
<version>1.6.2</version>
37+
<version>1.7.5</version>
4138
</dependency>
4239
</dependencies>
4340

api/src/main/java/com/ning/http/client/Cookie.java

Lines changed: 0 additions & 131 deletions
This file was deleted.

api/src/main/java/com/ning/http/client/PerRequestConfig.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

api/src/main/java/com/ning/http/client/extra/ThrottleRequestFilter.java

Lines changed: 0 additions & 134 deletions
This file was deleted.

0 commit comments

Comments
 (0)