From 2452730192f3137ab54b7016747e0222cb96cf5f Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Mon, 8 Jul 2024 15:42:05 -0700 Subject: [PATCH] Name old undertow servlet lib with version number This makes it clearer it isn't intended to be upgraded. We do this already for the other servlet containers (e.g., jetty-servlet10). --- gradle/libs.versions.toml | 4 ++-- servlet/build.gradle | 2 +- servlet/jakarta/build.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5527c6d5c7b..05120b5b262 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -96,8 +96,8 @@ tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.89" # 1.4.3+ causes "unknown enum constant ElementType.MODULE" warning. # https://github.com/google/truth/issues/1320 truth = "com.google.truth:truth:1.4.2" -undertow-servlet = "io.undertow:undertow-servlet:2.2.32.Final" -undertow-servlet-jakartaee9 = "io.undertow:undertow-servlet:2.3.14.Final" +undertow-servlet22 = "io.undertow:undertow-servlet:2.2.32.Final" +undertow-servlet = "io.undertow:undertow-servlet:2.3.14.Final" # Do not update: Pinned to the last version supporting Java 8. # See https://checkstyle.sourceforge.io/releasenotes.html#Release_10.1 diff --git a/servlet/build.gradle b/servlet/build.gradle index b6f8f6f0cce..fd5abb6f0e5 100644 --- a/servlet/build.gradle +++ b/servlet/build.gradle @@ -57,7 +57,7 @@ dependencies { exclude group: 'io.grpc', module: 'grpc-xds' } - undertowTestImplementation libraries.undertow.servlet + undertowTestImplementation libraries.undertow.servlet22 tomcatTestImplementation libraries.tomcat.embed.core9 diff --git a/servlet/jakarta/build.gradle b/servlet/jakarta/build.gradle index 71de639daa7..51333856ddf 100644 --- a/servlet/jakarta/build.gradle +++ b/servlet/jakarta/build.gradle @@ -99,7 +99,7 @@ dependencies { jettyTestImplementation libraries.jetty.servlet, libraries.jetty.http2.server - undertowTestImplementation libraries.undertow.servlet.jakartaee9 + undertowTestImplementation libraries.undertow.servlet } // Set up individual classpaths for each test, to avoid any mismatch,