From a1c6ed594b53441d7c7a653924a0270bcf1280eb Mon Sep 17 00:00:00 2001 From: Carter Kozak Date: Mon, 3 Apr 2023 11:12:20 -0400 Subject: [PATCH] Upgrade Undertow to latest (#2011) Upgrade Undertow to latest --- .../palantir/conjure/java/undertow/HttpServerExchanges.java | 6 ++++-- versions.lock | 2 +- versions.props | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conjure-java-undertow-runtime/src/test/java/com/palantir/conjure/java/undertow/HttpServerExchanges.java b/conjure-java-undertow-runtime/src/test/java/com/palantir/conjure/java/undertow/HttpServerExchanges.java index f1cf6682d..f91ea200e 100644 --- a/conjure-java-undertow-runtime/src/test/java/com/palantir/conjure/java/undertow/HttpServerExchanges.java +++ b/conjure-java-undertow-runtime/src/test/java/com/palantir/conjure/java/undertow/HttpServerExchanges.java @@ -28,6 +28,7 @@ import org.xnio.OptionMap; import org.xnio.StreamConnection; import org.xnio.XnioIoThread; +import org.xnio.channels.Configurable; import org.xnio.conduits.ConduitStreamSinkChannel; import org.xnio.conduits.ConduitStreamSourceChannel; import org.xnio.conduits.StreamSinkConduit; @@ -43,10 +44,11 @@ public static HttpServerExchange createStub() { private static StreamConnection createStreamConnection() { StreamConnection streamConnection = mock(StreamConnection.class); - ConduitStreamSinkChannel sinkChannel = new ConduitStreamSinkChannel(null, mock(StreamSinkConduit.class)); + ConduitStreamSinkChannel sinkChannel = + new ConduitStreamSinkChannel(Configurable.EMPTY, mock(StreamSinkConduit.class)); lenient().when(streamConnection.getSinkChannel()).thenReturn(sinkChannel); ConduitStreamSourceChannel sourceChannel = - new ConduitStreamSourceChannel(null, mock(StreamSourceConduit.class)); + new ConduitStreamSourceChannel(Configurable.EMPTY, mock(StreamSourceConduit.class)); lenient().when(streamConnection.getSourceChannel()).thenReturn(sourceChannel); XnioIoThread ioThread = mock(XnioIoThread.class); lenient().when(streamConnection.getIoThread()).thenReturn(ioThread); diff --git a/versions.lock b/versions.lock index e8eda4aaf..16b612568 100644 --- a/versions.lock +++ b/versions.lock @@ -58,7 +58,7 @@ com.palantir.tritium:tritium-registry:0.63.0 (11 constraints: f3df9b98) com.squareup:javapoet:1.13.0 (2 constraints: 2b113eee) info.picocli:picocli:4.7.1 (1 constraints: 0e051536) io.dropwizard.metrics:metrics-core:4.1.33 (24 constraints: 6c7ccc07) -io.undertow:undertow-core:2.2.19.Final (2 constraints: e91964fe) +io.undertow:undertow-core:2.2.24.Final (2 constraints: e51975fd) javax.annotation:javax.annotation-api:1.3.2 (7 constraints: 396987f4) javax.validation:validation-api:2.0.1.Final (13 constraints: e5c5c6d1) javax.ws.rs:javax.ws.rs-api:2.1.1 (14 constraints: b4f4b54a) diff --git a/versions.props b/versions.props index 9f5084ff8..53db0ecad 100644 --- a/versions.props +++ b/versions.props @@ -20,7 +20,7 @@ com.squareup:javapoet = 1.13.0 info.picocli:picocli = 4.7.1 io.dropwizard.metrics:metrics-core = 4.1.0 io.dropwizard:dropwizard-* = 2.0.34 -io.undertow:undertow-core = 2.2.19.Final +io.undertow:* = 2.2.24.Final javax.annotation:javax.annotation-api = 1.3.2 javax.validation:validation-api = 2.0.1.Final javax.ws.rs:javax.ws.rs-api = 2.1.1