Skip to content
Permalink
Browse files

[JENKINS-48357] get rid of atlassian http client (#145)

[JENKINS-48357]

* import sources from Atlassian Async HttpClient so we can use whatever we want as apache httpclient version

Signed-off-by: olivier lamy <olamy@apache.org>

* remove non used imported classes

Signed-off-by: olivier lamy <olamy@apache.org>

* get rid of this class

Signed-off-by: olivier lamy <olamy@apache.org>

* modern :-)

Signed-off-by: olivier lamy <olamy@apache.org>

* add note on Atlassian sources import

Signed-off-by: olivier lamy <olamy@apache.org>

* add Atlassian pom for history purpose

Signed-off-by: olivier lamy <olamy@apache.org>

* [JENKINS-48357] get rid of non used class

Signed-off-by: olivier lamy <olamy@apache.org>

* get rid of this httpasyncclient-cache

Signed-off-by: olivier lamy <olamy@apache.org>

* use last apache-httpcomponents-client-4-api 4.5.5-2.0 which include asynchttpclient now

Signed-off-by: olivier lamy <olamy@apache.org>

* add back jenkins-ci repo

Signed-off-by: olivier lamy <olamy@apache.org>

* exclude atlassian classes from coverage

Signed-off-by: olivier lamy <olamy@apache.org>
  • Loading branch information
olamy committed May 2, 2018
1 parent 07e3440 commit abd092848b1e617ceb31b16de07b1445d34c4d03
Showing with 2,809 additions and 5 deletions.
  1. +8 −0 README.md
  2. +10 −5 pom.xml
  3. +573 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClient.java
  4. +83 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/CommonBuilder.java
  5. +87 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/DefaultHttpClientFactory.java
  6. +159 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/DefaultMessage.java
  7. +305 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/DefaultRequest.java
  8. +286 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/DefaultResponse.java
  9. +19 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/EntityByteArrayInputStream.java
  10. +160 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/Headers.java
  11. +60 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/MavenUtils.java
  12. +11 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/PromiseHttpAsyncClient.java
  13. +76 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/RedirectStrategy.java
  14. +72 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/RequestEntityEffect.java
  15. +202 −0 ...a/com/atlassian/httpclient/apache/httpcomponents/SettableFuturePromiseHttpPromiseAsyncClient.java
  16. +79 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/proxy/ProvidedProxyConfig.java
  17. +50 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/proxy/ProxyConfig.java
  18. +68 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/proxy/ProxyConfigFactory.java
  19. +77 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/proxy/ProxyCredentialsProvider.java
  20. +110 −0 src/main/java/com/atlassian/httpclient/apache/httpcomponents/proxy/SystemPropertiesProxyConfig.java
  21. +57 −0 src/main/java/com/atlassian/httpclient/base/event/AbstractHttpRequestEvent.java
  22. +12 −0 src/main/java/com/atlassian/httpclient/base/event/HttpRequestCompletedEvent.java
  23. +16 −0 src/main/java/com/atlassian/httpclient/base/event/HttpRequestFailedEvent.java
  24. +229 −0 src/main/resources/atlassian-httpclient-plugin-0.23.0.pom
@@ -57,3 +57,11 @@ Before submitting your change make sure that:
There have been many developers involved in the git plugin and there are many, many users who depend on the git-plugin.
Tests help us assure that we're delivering a reliable plugin, and that we've communicated our intent to other developers in a way that they can detect when they run tests.

### Atlassian sources import

To resolve some binary compatiblity issues [JENKINS-48357](https://issues.jenkins-ci.org/browse/JENKINS-48357),
the sources from the artifact [com.atlassian.httpclient:atlassian-httpclient-plugin:0.23](https://packages.atlassian.com/maven-external/com/atlassian/httpclient/atlassian-httpclient-plugin/0.23.0/)
has been imported in the project to have control over http(s) protocol transport layer.
The downloaded sources didn't have any license headers but based on the [pom](https://packages.atlassian.com/maven-external/com/atlassian/httpclient/atlassian-httpclient-plugin/0.23.0/atlassian-httpclient-plugin-0.23.0.pom)
sources are Apache License (see pom in src/main/resources/atlassian-httpclient-plugin-0.23.0.pom)

15 pom.xml
@@ -132,6 +132,7 @@
</ignores>
<excludes>
<exclude>hudson/plugins/jira/Messages*.class</exclude>
<exclude>com/atlassian/httpclient/**/*.class</exclude>
</excludes>
</instrumentation>
</configuration>
@@ -184,7 +185,7 @@
<groupId>com.googlecode.lambdaj</groupId>
<artifactId>lambdaj</artifactId>
<version>2.3.3</version>
</dependency>
</dependency>
<dependency>
<groupId>com.atlassian.jira</groupId>
<artifactId>jira-rest-java-client-api</artifactId>
@@ -217,19 +218,23 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</exclusion>
<exclusion>
<groupId>com.atlassian.httpclient</groupId>
<artifactId>atlassian-httpclient-plugin</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.atlassian.fugue</groupId>
<artifactId>fugue</artifactId>
<version>${fugue.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>apache-httpcomponents-client-4-api</artifactId>
<version>4.5.3-2.0</version>
<version>4.5.5-2.0</version>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
@@ -372,7 +377,7 @@


<repositories>
<!-- <repository>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
<releases>
@@ -381,7 +386,7 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>-->
</repository>
<repository>
<id>atlassian-public</id>
<url>https://packages.atlassian.com/maven/repository/public</url>

0 comments on commit abd0928

Please sign in to comment.
You can’t perform that action at this time.