Skip to content

Commit f8ef784

Browse files
authored
Upgrade httpclient to 5.3.3 for build-tools-internal (#124018)
1 parent 74bb0f9 commit f8ef784

File tree

6 files changed

+32
-23
lines changed

6 files changed

+32
-23
lines changed

build-tools-internal/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,6 @@ dependencies {
282282
api "org.elasticsearch:build-conventions:$version"
283283
api "org.elasticsearch.gradle:build-tools:$version"
284284

285-
// same version as http client transitive dep
286-
api buildLibs.commons.codec
287285
api buildLibs.apache.compress
288286
api buildLibs.nebula.info
289287
api buildLibs.apache.rat
@@ -303,8 +301,8 @@ dependencies {
303301
api buildLibs.antlrst4
304302
api buildLibs.asm
305303
api buildLibs.asm.tree
306-
api buildLibs.httpclient
307-
api buildLibs.httpcore
304+
api buildLibs.httpclient5
305+
api buildLibs.httpcore5
308306

309307
compileOnly buildLibs.checkstyle
310308
compileOnly buildLibs.reflections

build-tools-internal/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pluginManagement {
55
}
66

77
includeBuild "../build-conventions"
8-
includeBuild "../build-tools"
8+
includeBuild "../build-tools"
99
}
1010

1111
plugins {

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/snyk/UploadSnykDependenciesGraph.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99

1010
package org.elasticsearch.gradle.internal.snyk;
1111

12-
import org.apache.http.client.methods.CloseableHttpResponse;
13-
import org.apache.http.client.methods.HttpPut;
14-
import org.apache.http.entity.FileEntity;
15-
import org.apache.http.impl.client.CloseableHttpClient;
16-
import org.apache.http.impl.client.HttpClients;
17-
import org.apache.http.util.EntityUtils;
12+
import org.apache.hc.client5.http.classic.methods.HttpPut;
13+
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
14+
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
15+
import org.apache.hc.client5.http.impl.classic.HttpClients;
16+
import org.apache.hc.core5.http.ContentType;
17+
import org.apache.hc.core5.http.ParseException;
18+
import org.apache.hc.core5.http.io.entity.EntityUtils;
19+
import org.apache.hc.core5.http.io.entity.FileEntity;
1820
import org.gradle.api.DefaultTask;
1921
import org.gradle.api.GradleException;
2022
import org.gradle.api.file.RegularFileProperty;
@@ -61,16 +63,16 @@ void upload() {
6163
HttpPut putRequest = new HttpPut(endpoint);
6264
putRequest.addHeader("Authorization", "token " + token.get());
6365
putRequest.addHeader("Content-Type", "application/json");
64-
putRequest.setEntity(new FileEntity(inputFile.getAsFile().get()));
66+
putRequest.setEntity(new FileEntity(inputFile.getAsFile().get(), ContentType.APPLICATION_JSON));
6567
response = client.execute(putRequest);
66-
int statusCode = response.getStatusLine().getStatusCode();
68+
int statusCode = response.getCode();
6769
String responseString = EntityUtils.toString(response.getEntity());
6870
getLogger().info("Snyk API call response status: " + statusCode);
6971
if (statusCode != HttpURLConnection.HTTP_CREATED) {
7072
throw new GradleException("Uploading Snyk Graph failed with http code " + statusCode + ": " + responseString);
7173
}
7274
getLogger().info(responseString);
73-
} catch (IOException e) {
75+
} catch (IOException | ParseException e) {
7476
throw new GradleException("Failed to call API endpoint to submit updated dependency graph", e);
7577
}
7678
}

distribution/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
274274
}
275275
all {
276276
resolutionStrategy.dependencySubstitution {
277-
substitute module("org.apache.logging.log4j:log4j-core") using project(":libs:log4j") because "patched to remove JndiLookup clas"}
277+
substitute module("org.apache.logging.log4j:log4j-core") using project(":libs:log4j") because "patched to remove JndiLookup class"}
278278
}
279279
}
280280

gradle/build.versions.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@ asm = { group = "org.ow2.asm", name="asm", version.ref="asm" }
1313
asm-tree = { group = "org.ow2.asm", name="asm-tree", version.ref="asm" }
1414
bytebuddy = "net.bytebuddy:byte-buddy:1.15.11"
1515
checkstyle = "com.puppycrawl.tools:checkstyle:10.3"
16-
commons-codec = "commons-codec:commons-codec:1.11"
1716
commmons-io = "commons-io:commons-io:2.2"
1817
docker-compose = "com.avast.gradle:gradle-docker-compose-plugin:0.17.5"
1918
forbiddenApis = "de.thetaphi:forbiddenapis:3.8"
2019
gradle-enterprise = "com.gradle:develocity-gradle-plugin:3.18.1"
2120
hamcrest = "org.hamcrest:hamcrest:2.1"
22-
httpcore = "org.apache.httpcomponents:httpcore:4.4.16"
23-
httpclient = "org.apache.httpcomponents:httpclient:4.5.14"
21+
httpcore5 = "org.apache.httpcomponents.core5:httpcore5:5.3.3"
22+
httpclient5 = "org.apache.httpcomponents.client5:httpclient5:5.4.2"
2423
idea-ext = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.4"
2524
javaparser = "com.github.javaparser:javaparser-core:3.18.0"
2625
json-schema-validator = "com.networknt:json-schema-validator:1.0.72"

gradle/verification-metadata.xml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1970,11 +1970,6 @@
19701970
<sha256 value="1df8b9430b5c8ed143d7815e403e33ef5371b2400aadbe9bda0883762e0846d1" origin="Generated by Gradle"/>
19711971
</artifact>
19721972
</component>
1973-
<component group="org.apache.commons" name="commons-compress" version="1.19">
1974-
<artifact name="commons-compress-1.19.jar">
1975-
<sha256 value="ff2d59fad74e867630fbc7daab14c432654712ac624dbee468d220677b124dd5" origin="Generated by Gradle"/>
1976-
</artifact>
1977-
</component>
19781973
<component group="org.apache.commons" name="commons-compress" version="1.21">
19791974
<artifact name="commons-compress-1.21.jar">
19801975
<sha256 value="6aecfd5459728a595601cfa07258d131972ffc39b492eb48bdd596577a2f244a" origin="Generated by Gradle"/>
@@ -2618,6 +2613,21 @@
26182613
<sha256 value="4018736ede2d321034e8517ea90baefb31831a8608afccc446d8a699fb1d00d4" origin="Generated by Gradle"/>
26192614
</artifact>
26202615
</component>
2616+
<component group="org.apache.httpcomponents.client5" name="httpclient5" version="5.4.2">
2617+
<artifact name="httpclient5-5.4.2.jar">
2618+
<sha256 value="a0a9dcd3696a6281f82e392d39aa674bf9662496605411de2a00d44435a7fb26" origin="Generated by Gradle"/>
2619+
</artifact>
2620+
</component>
2621+
<component group="org.apache.httpcomponents.core5" name="httpcore5" version="5.3.3">
2622+
<artifact name="httpcore5-5.3.3.jar">
2623+
<sha256 value="087b7ae9bde9d3518b4b5d06f3560d7fd0db04098655e76b64e791773847d503" origin="Generated by Gradle"/>
2624+
</artifact>
2625+
</component>
2626+
<component group="org.apache.httpcomponents.core5" name="httpcore5-h2" version="5.3.3">
2627+
<artifact name="httpcore5-h2-5.3.3.jar">
2628+
<sha256 value="a121f4b14ec525e54e29b9f5db7b93f4a97e088774e81c7143b5198f67d81bec" origin="Generated by Gradle"/>
2629+
</artifact>
2630+
</component>
26212631
<component group="org.apache.james" name="apache-mime4j-core" version="0.8.11">
26222632
<artifact name="apache-mime4j-core-0.8.11.jar">
26232633
<sha256 value="62a7853523dff0c382065df82fa280c1bf59bcd9b329180d707b0f6f15ceb903" origin="Generated by Gradle"/>

0 commit comments

Comments
 (0)