diff --git a/build-resources/pom.xml b/build-resources/pom.xml index 1a6cc4829de3..5ba9daec5057 100644 --- a/build-resources/pom.xml +++ b/build-resources/pom.xml @@ -19,7 +19,7 @@ 3.4.0 true 3.2.0 - 3.3.1 + 3.5.0 UTF-8 diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 3cfc33af568d..446c747a14bc 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -12,7 +12,7 @@ Jetty JAAS support - 2.1.6 + 2.1.7 2.0.0.AM27 ${project.groupId}.jaas org.eclipse.jetty.jaas.* diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContextEvent.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContextEvent.java index d446d8e3bd5c..7f446470ab7f 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContextEvent.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContextEvent.java @@ -36,7 +36,7 @@ public class AsyncContextEvent extends AsyncEvent implements Runnable public AsyncContextEvent(Context context, AsyncContextState asyncContext, HttpChannelState state, Request baseRequest, ServletRequest request, ServletResponse response) { - this (context, asyncContext, state, baseRequest, request, response, null); + this(context, asyncContext, state, baseRequest, request, response, null); } public AsyncContextEvent(Context context, AsyncContextState asyncContext, HttpChannelState state, Request baseRequest, ServletRequest request, ServletResponse response, HttpURI baseURI) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartInputStreamParser.java b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartInputStreamParser.java index f43a3e8202d2..577e72a6a453 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartInputStreamParser.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/MultiPartInputStreamParser.java @@ -379,7 +379,7 @@ public String getContentDispositionFilename() */ public MultiPartInputStreamParser(InputStream in, String contentType, MultipartConfigElement config, File contextTmpDir) { - this (in, contentType, config, contextTmpDir, ContextHandler.DEFAULT_MAX_FORM_KEYS); + this(in, contentType, config, contextTmpDir, ContextHandler.DEFAULT_MAX_FORM_KEYS); } /** diff --git a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java index c1c7d0af22d7..c736668178e7 100644 --- a/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java +++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java @@ -46,7 +46,7 @@ public WebSocketComponents() public WebSocketComponents(WebSocketExtensionRegistry extensionRegistry, DecoratedObjectFactory objectFactory, ByteBufferPool bufferPool, InflaterPool inflaterPool, DeflaterPool deflaterPool) { - this (extensionRegistry, objectFactory, bufferPool, inflaterPool, deflaterPool, null); + this(extensionRegistry, objectFactory, bufferPool, inflaterPool, deflaterPool, null); } public WebSocketComponents(WebSocketExtensionRegistry extensionRegistry, DecoratedObjectFactory objectFactory, diff --git a/pom.xml b/pom.xml index f4b124c156a3..901eb3423b58 100644 --- a/pom.xml +++ b/pom.xml @@ -194,20 +194,20 @@ 2.0.10 - 1.10.14 - 1.11.3 + 1.10.15 + 1.12.0 4.5.14 4.4.16 9.7 - 4.2.1 + 4.2.2 6.4.1 3.6.0 1.5 - 3.2.0 - 10.17.0 + 3.2.1 + 10.18.1 1.17.1 - 3.15.0 - 1.26.2 + 3.17.0 + 1.27.1 2.16.1 11 11 @@ -218,14 +218,14 @@ 7.0.5 3.0.2 1.6.0 - 2.30.0 + 2.31.0 4.0.6 1.66.0 2.11.0 - 33.2.1-jre + 33.3.0-jre 5.1.0 1.0.10 - 2.2 + 3.0 3.0.2 5.3.7 4.6.5.Final @@ -268,7 +268,7 @@ 1.0.7 4.0.6 -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx4g -Xms2g -Xlog:gc:stderr:time,level,tags - 6.2 + 6.3 false /tmp https://eclipse.dev/jetty/ @@ -285,40 +285,40 @@ 1.1.1 2.5.1 9.0.90 - 5.10.3 - 2.0.3 + 5.11.0 + 2.1.0 4.5 ${project.build.directory}/local-repo - 2.23.1 + 2.24.0 1.3.14 10.3.6 3.4.1 - 3.13.1 + 3.15.0 3.1.0 3.7.1 5.1.9 - 3.4.0 + 3.5.0 3.4.0 false 3.13.0 - 3.7.1 - 3.1.2 + 3.8.0 + 3.1.3 3.5.0 - 3.3.0 - 3.2.4 - 3.1.2 - 3.7.0 + 3.4.1 + 3.2.5 + 3.1.3 + 3.8.0 3.4.2 - 3.8.0 - 3.13.1 + 3.10.0 + 3.15.0 3.1.1 3.2.0 - 1.9.21 + 1.9.22 3.3.1 3.6.0 3.3.1 - 3.3.1 - 3.9.6 + 3.5.0 + 3.9.8 3.4.0 2.2.3 @@ -335,8 +335,8 @@ 4.0.4 UTF-8 src/it/settings.xml - 2.0.9 - 4.8.6.2 + 2.0.13 + 4.8.6.3 2.1.1.RELEASE 0 1.2.5 @@ -1306,6 +1306,11 @@ websocket-servlet ${project.version} + + org.eclipse.sisu + org.eclipse.sisu.inject + 0.9.0.M3 + org.glassfish.jaxb jaxb-runtime