Skip to content

Commit b69e4b7

Browse files
authored
Merge pull request #1569 from opensearch-project/dependabot/gradle/gradle-all-6c65f88833
Bump the gradle-all group across 1 directory with 43 updates
2 parents ad8c6b9 + b270bf1 commit b69e4b7

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/HttpByteBufFormatter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public static <T> T processHttpMessageFromBufs(HttpMessageType msgType,
250250
ChannelHandler... handlers) {
251251
EmbeddedChannel channel = new EmbeddedChannel(
252252
msgType == HttpMessageType.REQUEST ? new HttpRequestDecoder() : new HttpResponseDecoder(),
253-
new HttpContentDecompressor()
253+
new HttpContentDecompressor(0)
254254
);
255255
for (var h : handlers) {
256256
channel.pipeline().addLast(h);

TrafficCapture/trafficReplayer/src/main/java/org/opensearch/migrations/replay/datahandlers/http/RequestPipelineOrchestrator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ void addContentParsingHandlers(
146146
pipeline.addLast(new ReadMeteringHandler(httpTransactionContext::onPayloadBytesIn));
147147
// IN: Netty HttpRequest(1) + HttpJsonRequest(1) with headers + HttpContent(1) blocks (which may be compressed)
148148
// OUT: Netty HttpRequest(2) + HttpJsonRequest(1) with headers + HttpContent(2) uncompressed blocks
149-
pipeline.addLast(new HttpContentDecompressor());
149+
pipeline.addLast(new HttpContentDecompressor(0));
150150
pipeline.addLast(new ReadMeteringHandler(httpTransactionContext::onUncompressedBytesIn));
151151
if (transformer != null) {
152152
httpTransactionContext.onJsonPayloadParseRequired();

TrafficCapture/trafficReplayer/src/testFixtures/java/org/opensearch/migrations/replay/TestUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public static void verifyCapturedResponseMatchesExpectedPayload(
117117
AtomicReference<FullHttpRequest> fullHttpRequestAtomicReference = new AtomicReference<>();
118118
EmbeddedChannel unpackVerifier = new EmbeddedChannel(
119119
new HttpRequestDecoder(),
120-
new HttpContentDecompressor(),
120+
new HttpContentDecompressor(0),
121121
new HttpObjectAggregator(bytesCaptured.length * 2),
122122
new SimpleChannelInboundHandler<FullHttpRequest>() {
123123
@Override

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import groovy.json.JsonOutput
33
plugins {
44
// Observing higher memory usage with task-tree plugin. Disabling except if needed
55
// id "com.dorongold.task-tree" version "4.0.1"
6-
id "com.diffplug.spotless" version '7.0.3'
6+
id "com.diffplug.spotless" version '7.0.4'
77
id 'io.freefair.lombok' version '8.13.1' apply false
88
id 'me.champeau.jmh' version '0.7.3' apply false
99
id 'com.gradleup.shadow' version '8.3.6' apply false
@@ -135,7 +135,7 @@ subprojects {
135135
force 'commons-net:commons-net:3.11.1'
136136
force 'dnsjava:dnsjava:3.6.3'
137137
force 'net.minidev:json-smart:2.5.2'
138-
force 'org.apache.tika:tika-core:3.1.0'
138+
force 'org.apache.tika:tika-core:3.2.0'
139139
force 'org.glassfish.jersey.core:jersey-common:3.1.10'
140140
force 'org.jsoup:jsoup:1.20.1'
141141
force 'org.xerial.snappy:snappy-java:1.1.10.7'

gradle/libs.versions.toml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
[versions]
2-
aws-crt = "0.38.2"
2+
aws-crt = "0.38.4"
33
aws-msk-iam-auth = "2.3.2"
4-
aws-sdk = "2.31.40"
5-
bouncycastle = "1.80"
4+
aws-sdk = "2.31.59"
5+
bouncycastle = "1.81"
66
commons-collections = "4.5.0"
77
commons-compress = "1.27.1"
88
disruptor = "4.0.0"
9-
dockerapi = "3.5.0"
9+
dockerapi = "3.5.1"
1010
errorprone = "2.38.0"
1111
graalvm = "24.2.1"
12-
groovy = "3.0.24"
12+
groovy = "3.0.25"
1313
guava = "33.4.8-jre"
1414
hamcrest = "3.0"
15-
httpclient5 = "5.4.4"
15+
httpclient5 = "5.5"
1616
jackson = "2.19.0"
1717
jcommander = "2.0"
1818
jenkins-pipeline-unit = "1.23"
1919
jmespath-core = "0.6.0"
2020
jmeter = "5.6.3"
2121
jmh-core = "1.37"
2222
jolt-core = "0.1.8"
23-
json = "20250107"
24-
junit-platform = "1.12.2"
25-
junit-jupiter = "5.12.2"
23+
json = "20250517"
24+
junit-platform = "1.13.1"
25+
junit-jupiter = "5.13.1"
2626
kafka-clients = "4.0.0"
2727
log4j = "2.24.3"
2828
lombok = "1.18.38"
2929
lucene6 = '6.6.6'
3030
lucene7 = '7.7.3'
3131
lucene9 = "9.12.1"
32-
mockito = "5.17.0"
33-
netty = "4.1.121.Final"
32+
mockito = "5.18.0"
33+
netty = "4.1.122.Final"
3434
opensearch-testcontainers = "2.0.1"
35-
opentelemetry = "1.50.0"
35+
opentelemetry = "1.51.0"
3636
opentelemetry-semconv = "1.23.1-alpha"
37-
protobuf = "4.30.2"
38-
reactor-netty = "1.2.5"
39-
reactor-test = "3.7.5"
40-
semver4j = "5.7.0"
37+
protobuf = "4.31.1"
38+
reactor-netty = "1.2.6"
39+
reactor-test = "3.7.6"
40+
semver4j = "5.7.1"
4141
slf4j = "2.0.17"
42-
testcontainers = "1.21.0"
42+
testcontainers = "1.21.1"
4343
toxiproxy = "2.1.7"
4444

4545
[libraries]

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import java.nio.file.Paths
1010

1111
plugins {
1212
id("com.gradle.develocity") version("3.18.1")
13-
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
13+
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
1414
}
1515

1616
void addSubProjects(String path, File dir) {

0 commit comments

Comments
 (0)