From 42c93a900b9af68e894089b2dbb6c44390c4aff4 Mon Sep 17 00:00:00 2001 From: HankHerr-NOAA Date: Fri, 13 Sep 2024 12:20:33 +0000 Subject: [PATCH] Updated jetty and jersey dependencies, at least until they are tested, for #313 and #68 --- build.gradle | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 352059e99..29f3cbdb7 100755 --- a/build.gradle +++ b/build.gradle @@ -1347,23 +1347,23 @@ project(':wres-tasker') { implementation 'commons-codec:commons-codec:1.17.1' // Server library to run a web server: - implementation 'org.eclipse.jetty:jetty-server:11.0.20' + implementation 'org.eclipse.jetty:jetty-server:11.0.24' // Support HTTP/2 implementation 'org.eclipse.jetty.http2:http2-server:11.0.24' // Support ALPN - implementation 'org.eclipse.jetty:jetty-alpn-java-server:11.0.21' + implementation 'org.eclipse.jetty:jetty-alpn-java-server:11.0.24' // Servlet container library to run a web application with: implementation 'org.eclipse.jetty:jetty-webapp:11.0.24' // Needed at compile-time to reference ServletContainer.class and // DefaultServlet.class - implementation 'org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.6' + implementation 'org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.8' // To handle multipart post - implementation 'org.glassfish.jersey.media:jersey-media-multipart:3.1.6' + implementation 'org.glassfish.jersey.media:jersey-media-multipart:3.1.8' // To temporarily cache/store-in-RAM job metadata when redis unavailable implementation('com.github.ben-manes.caffeine:caffeine:3.1.8') { @@ -1408,11 +1408,11 @@ project(':wres-tasker') { exclude group: 'edu.washington.cs.types.checker', module: 'checker-framework' } - runtimeOnly 'org.glassfish.jersey.core:jersey-server:3.1.6' + runtimeOnly 'org.glassfish.jersey.core:jersey-server:3.1.8' // Needed to prevent "java.lang.IllegalStateException: InjectionManagerFactory not found." // Thanks, https://luohuahuang.org/2017/11/13/jersey-illegalstateexception-injectionmanagerfactory/ - runtimeOnly 'org.glassfish.jersey.inject:jersey-hk2:3.1.6' + runtimeOnly 'org.glassfish.jersey.inject:jersey-hk2:3.1.8' testImplementation 'junit:junit:4.13.2' testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.11.0' @@ -1883,10 +1883,10 @@ dependencies { // Needed at compile-time to reference ServletContainer.class and // DefaultServlet.class - implementation 'org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.6' + implementation 'org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.8' // Jetty server - implementation 'org.eclipse.jetty:jetty-server:11.0.20' + implementation 'org.eclipse.jetty:jetty-server:11.0.24' implementation('com.github.ben-manes.caffeine:caffeine:3.1.8') { // Not used at runtime, bloat @@ -1918,18 +1918,18 @@ dependencies { // JCIP annotations compileOnly group: 'net.jcip', name: 'jcip-annotations', version: '1.0' - runtimeOnly 'org.glassfish.jersey.containers:jersey-container-servlet:3.1.6' - runtimeOnly 'org.glassfish.jersey.core:jersey-server:3.1.6' + runtimeOnly 'org.glassfish.jersey.containers:jersey-container-servlet:3.1.8' + runtimeOnly 'org.glassfish.jersey.core:jersey-server:3.1.8' // currently locked at this version, check this ticket for more information // https://vlab.***REMOVED***/redmine/issues/124200 - runtimeOnly 'org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.3' - runtimeOnly 'org.glassfish.jersey.inject:jersey-hk2:3.1.6' + runtimeOnly 'org.glassfish.jersey.containers:jersey-container-jetty-http:3.1.8' + runtimeOnly 'org.glassfish.jersey.inject:jersey-hk2:3.1.8' // Support HTTP/2 implementation 'org.eclipse.jetty.http2:http2-server:11.0.24' // Support ALPN - implementation 'org.eclipse.jetty:jetty-alpn-java-server:11.0.20' + implementation 'org.eclipse.jetty:jetty-alpn-java-server:11.0.24' runtimeOnly('ch.qos.logback:logback-classic:1.5.8') { // Not used at runtime, bloat