Skip to content

Commit 67cc582

Browse files
hyperxprohyperxpro
authored
Start working on v2 (#1829)
1 parent bbca364 commit 67cc582

File tree

381 files changed

+34433
-33865
lines changed

Some content is hidden

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

381 files changed

+34433
-33865
lines changed

‎.github/workflows/maven.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
# This workflow is designed to build PRs for AHC. Note that it does not actually publish AHC, just builds and test it.
22
# Docs: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
33

4-
name: Test PR
4+
name: Build and Test PR
55

66
on:
7-
pull_request:
8-
branches: [ master ]
7+
push:
8+
workflow_dispatch:
9+
inputs:
10+
name:
11+
description: 'GitHub Actions'
12+
required: true
13+
default: 'GitHub Actions'
914

1015
jobs:
11-
build:
12-
runs-on: ubuntu-20.04
16+
Build:
17+
runs-on: ubuntu-latest
1318
steps:
14-
- uses: actions/checkout@v2
15-
- name: Set up JDK 1.8
16-
uses: actions/setup-java@v1
17-
with:
18-
java-version: 1.8
19-
- name: Build and test with Maven
20-
run: mvn test -Ptest-output
19+
- uses: actions/checkout@v3
20+
- name: Run Tests
21+
run: mvn -B -ntp clean test

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ jdk:
55
before_script:
66
- travis/before_script.sh
77

8-
script:
8+
script:
99
- mvn test javadoc:javadoc -Ptest-output
1010
- find $HOME/.m2 -name "_remote.repositories" | xargs rm
1111
- find $HOME/.m2 -name "resolver-status.properties" | xargs rm -f
12-
12+
1313
# If building master, Publish to Sonatype
14-
after_success:
14+
after_success:
1515
- travis/after_success.sh
1616

1717
sudo: false

‎CHANGES.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,20 @@
1010
## From 2.0 to 2.1
1111

1212
* AHC 2.1 targets Netty 4.1.
13-
* `org.asynchttpclient.HttpResponseHeaders` was [dropped](https://github.com/AsyncHttpClient/async-http-client/commit/f4786f3ac7699f8f8664e7c7db0b7097585a0786) in favor of `io.netty.handler.codec.http.HttpHeaders`.
14-
* `org.asynchttpclient.cookie.Cookie` was [dropped](https://github.com/AsyncHttpClient/async-http-client/commit/a6d659ea0cc11fa5131304d8a04a7ba89c7a66af) in favor of `io.netty.handler.codec.http.cookie.Cookie` as AHC's cookie parsers were contributed to Netty.
13+
* `org.asynchttpclient.HttpResponseHeaders` was [dropped](https://github.com/AsyncHttpClient/async-http-client/commit/f4786f3ac7699f8f8664e7c7db0b7097585a0786) in favor
14+
of `io.netty.handler.codec.http.HttpHeaders`.
15+
* `org.asynchttpclient.cookie.Cookie` was [dropped](https://github.com/AsyncHttpClient/async-http-client/commit/a6d659ea0cc11fa5131304d8a04a7ba89c7a66af) in favor
16+
of `io.netty.handler.codec.http.cookie.Cookie` as AHC's cookie parsers were contributed to Netty.
1517
* AHC now has a RFC6265 `CookieStore` that is enabled by default. Implementation can be changed in `AsyncHttpClientConfig`.
1618
* `AsyncHttpClient` now exposes stats with `getClientStats`.
17-
* `AsyncHandlerExtensions` was [dropped](https://github.com/AsyncHttpClient/async-http-client/commit/1972c9b9984d6d9f9faca6edd4f2159013205aea) in favor of default methods in `AsyncHandler`.
19+
* `AsyncHandlerExtensions` was [dropped](https://github.com/AsyncHttpClient/async-http-client/commit/1972c9b9984d6d9f9faca6edd4f2159013205aea) in favor of default methods
20+
in `AsyncHandler`.
1821
* `WebSocket` and `WebSocketListener` methods were renamed to mention frames
1922
* `AsyncHttpClientConfig` various changes:
20-
* new `getCookieStore` now lets you configure a CookieStore (enabled by default)
21-
* new `isAggregateWebSocketFrameFragments` now lets you disable WebSocket fragmented frames aggregation
22-
* new `isUseLaxCookieEncoder` lets you loosen cookie chars validation
23-
* `isAcceptAnyCertificate` was dropped, as it didn't do what its name stated
24-
* new `isUseInsecureTrustManager` lets you use a permissive TrustManager, that would typically let you accept self-signed certificates
25-
* new `isDisableHttpsEndpointIdentificationAlgorithm` disables setting `HTTPS` algorithm on the SSLEngines, typically disables SNI and HTTPS hostname verification
26-
* new `isAggregateWebSocketFrameFragments` lets you disable fragmented WebSocket frames aggregation
23+
* new `getCookieStore` now lets you configure a CookieStore (enabled by default)
24+
* new `isAggregateWebSocketFrameFragments` now lets you disable WebSocket fragmented frames aggregation
25+
* new `isUseLaxCookieEncoder` lets you loosen cookie chars validation
26+
* `isAcceptAnyCertificate` was dropped, as it didn't do what its name stated
27+
* new `isUseInsecureTrustManager` lets you use a permissive TrustManager, that would typically let you accept self-signed certificates
28+
* new `isDisableHttpsEndpointIdentificationAlgorithm` disables setting `HTTPS` algorithm on the SSLEngines, typically disables SNI and HTTPS hostname verification
29+
* new `isAggregateWebSocketFrameFragments` lets you disable fragmented WebSocket frames aggregation

‎bom/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<parent>

‎client/pom.xml

Lines changed: 84 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,88 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
<parent>
3-
<groupId>org.asynchttpclient</groupId>
4-
<artifactId>async-http-client-project</artifactId>
5-
<version>2.12.4-SNAPSHOT</version>
6-
</parent>
7-
<modelVersion>4.0.0</modelVersion>
8-
<artifactId>async-http-client</artifactId>
9-
<name>Asynchronous Http Client</name>
10-
<description>The Async Http Client (AHC) classes.</description>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<parent>
4+
<groupId>org.asynchttpclient</groupId>
5+
<artifactId>async-http-client-project</artifactId>
6+
<version>2.12.4-SNAPSHOT</version>
7+
</parent>
8+
<modelVersion>4.0.0</modelVersion>
9+
<artifactId>async-http-client</artifactId>
10+
<name>Asynchronous Http Client</name>
11+
<description>The Async Http Client (AHC) classes.</description>
1112

12-
<properties>
13-
<javaModuleName>org.asynchttpclient.client</javaModuleName>
14-
</properties>
13+
<properties>
14+
<javaModuleName>org.asynchttpclient.client</javaModuleName>
15+
</properties>
1516

16-
<build>
17-
<plugins>
18-
<plugin>
19-
<artifactId>maven-jar-plugin</artifactId>
20-
<executions>
21-
<execution>
22-
<goals>
23-
<goal>test-jar</goal>
24-
</goals>
25-
</execution>
26-
</executions>
27-
</plugin>
28-
</plugins>
29-
</build>
17+
<build>
18+
<plugins>
19+
<plugin>
20+
<artifactId>maven-jar-plugin</artifactId>
21+
<executions>
22+
<execution>
23+
<goals>
24+
<goal>test-jar</goal>
25+
</goals>
26+
</execution>
27+
</executions>
28+
</plugin>
29+
</plugins>
30+
</build>
3031

31-
<dependencies>
32-
<dependency>
33-
<groupId>org.asynchttpclient</groupId>
34-
<artifactId>async-http-client-netty-utils</artifactId>
35-
<version>${project.version}</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>io.netty</groupId>
39-
<artifactId>netty-codec-http</artifactId>
40-
</dependency>
41-
<dependency>
42-
<groupId>io.netty</groupId>
43-
<artifactId>netty-handler</artifactId>
44-
</dependency>
45-
<dependency>
46-
<groupId>io.netty</groupId>
47-
<artifactId>netty-codec-socks</artifactId>
48-
</dependency>
49-
<dependency>
50-
<groupId>io.netty</groupId>
51-
<artifactId>netty-handler-proxy</artifactId>
52-
</dependency>
53-
<dependency>
54-
<groupId>io.netty</groupId>
55-
<artifactId>netty-transport-native-epoll</artifactId>
56-
<classifier>linux-x86_64</classifier>
57-
</dependency>
58-
<dependency>
59-
<groupId>io.netty</groupId>
60-
<artifactId>netty-transport-native-kqueue</artifactId>
61-
<classifier>osx-x86_64</classifier>
62-
</dependency>
63-
<dependency>
64-
<groupId>org.reactivestreams</groupId>
65-
<artifactId>reactive-streams</artifactId>
66-
</dependency>
67-
<dependency>
68-
<groupId>com.typesafe.netty</groupId>
69-
<artifactId>netty-reactive-streams</artifactId>
70-
</dependency>
71-
<dependency>
72-
<groupId>io.reactivex.rxjava2</groupId>
73-
<artifactId>rxjava</artifactId>
74-
<scope>test</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.reactivestreams</groupId>
78-
<artifactId>reactive-streams-examples</artifactId>
79-
<scope>test</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>org.apache.kerby</groupId>
83-
<artifactId>kerb-simplekdc</artifactId>
84-
<scope>test</scope>
85-
</dependency>
86-
</dependencies>
32+
<dependencies>
33+
<dependency>
34+
<groupId>org.asynchttpclient</groupId>
35+
<artifactId>async-http-client-netty-utils</artifactId>
36+
<version>${project.version}</version>
37+
</dependency>
38+
<dependency>
39+
<groupId>io.netty</groupId>
40+
<artifactId>netty-codec-http</artifactId>
41+
</dependency>
42+
<dependency>
43+
<groupId>io.netty</groupId>
44+
<artifactId>netty-handler</artifactId>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.netty</groupId>
48+
<artifactId>netty-codec-socks</artifactId>
49+
</dependency>
50+
<dependency>
51+
<groupId>io.netty</groupId>
52+
<artifactId>netty-handler-proxy</artifactId>
53+
</dependency>
54+
<dependency>
55+
<groupId>io.netty</groupId>
56+
<artifactId>netty-transport-native-epoll</artifactId>
57+
<classifier>linux-x86_64</classifier>
58+
</dependency>
59+
<dependency>
60+
<groupId>io.netty</groupId>
61+
<artifactId>netty-transport-native-kqueue</artifactId>
62+
<classifier>osx-x86_64</classifier>
63+
</dependency>
64+
<dependency>
65+
<groupId>org.reactivestreams</groupId>
66+
<artifactId>reactive-streams</artifactId>
67+
</dependency>
68+
<dependency>
69+
<groupId>com.typesafe.netty</groupId>
70+
<artifactId>netty-reactive-streams</artifactId>
71+
</dependency>
72+
<dependency>
73+
<groupId>io.reactivex.rxjava2</groupId>
74+
<artifactId>rxjava</artifactId>
75+
<scope>test</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.reactivestreams</groupId>
79+
<artifactId>reactive-streams-examples</artifactId>
80+
<scope>test</scope>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.apache.kerby</groupId>
84+
<artifactId>kerb-simplekdc</artifactId>
85+
<scope>test</scope>
86+
</dependency>
87+
</dependencies>
8788
</project>

0 commit comments

Comments
 (0)