From 0d55daff84dfc11b12517e47467387f4795c5bea Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Mon, 16 Nov 2026 15:09:43 +0100 Subject: [PATCH 1/3] collection: Servlet API compatibility From 98875ae10cc73c6b7c60a6f12ccff27e232e2bf8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Nov 2026 08:05:18 +0100 Subject: [PATCH 2/3] chore(deps): bump javax.servlet:javax.servlet-api from 3.1.0 to 4.0.1 (#6475) Bumps [javax.servlet:javax.servlet-api](https://github.com/javaee/servlet-spec) from 3.1.0 to 4.0.1. - [Commits](https://github.com/javaee/servlet-spec/compare/3.1.0...4.0.1) --- updated-dependencies: - dependency-name: javax.servlet:javax.servlet-api dependency-version: 4.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 88af43cd57..4fe8d3434c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -198,7 +198,7 @@ retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" } sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.17.6" } sentry-native-ndk-outproc = { module = "io.sentry:sentry-native-ndk-outproc", version = "1.0.0-beta.1" } -servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" } +servlet-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" } servlet4-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" } servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" } slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } From 48a933420b51d463547fd6fcb399979bf73dd270 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Tue, 17 Nov 2026 09:43:19 +0100 Subject: [PATCH 3/3] build(servlet): Keep Servlet 3.1 as compatibility floor Compile the javax servlet integrations against the minimum supported API. Exclude the intentionally pinned API from Dependabot while retaining the separate Servlet 4 alias for latest-runtime coverage. Co-Authored-By: Claude --- .github/dependabot.yml | 2 ++ gradle/libs.versions.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 93fc79f4a2..c2eaf195f6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,6 +17,8 @@ updates: ignore: - dependency-name: "org.springframework.boot*" - dependency-name: "io.opentelemetry*" + # Servlet 3.1 is the minimum supported API and must remain the production compile target. + - dependency-name: "javax.servlet:javax.servlet-api" # DGS 5+ needs Spring Boot 3; the sample is on Spring Boot 2. - dependency-name: "com.netflix.graphql.dgs*" commit-message: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4fe8d3434c..88af43cd57 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -198,7 +198,7 @@ retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" } sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.17.6" } sentry-native-ndk-outproc = { module = "io.sentry:sentry-native-ndk-outproc", version = "1.0.0-beta.1" } -servlet-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" } +servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" } servlet4-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" } servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" } slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }