From 463c4dc58c56f5a90e2b71e9ca60aad69daba004 Mon Sep 17 00:00:00 2001 From: "Michael H. Siemaszko" Date: Mon, 15 May 2023 00:43:59 +0200 Subject: [PATCH 1/2] Relaxed Jakarta Servlet API version to 5.x in GraphQL Java Servlet - Relaxed Jakarta Servlet API version to 5.x for 'api' dependencies - Kept Jakarta Servlet API version at 6.x for 'testImplementation' dependencies - since Jakarta Servlet API 6.x is required only for tests --- graphql-java-servlet/build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/graphql-java-servlet/build.gradle b/graphql-java-servlet/build.gradle index fa99835b..d6edce6b 100644 --- a/graphql-java-servlet/build.gradle +++ b/graphql-java-servlet/build.gradle @@ -16,7 +16,7 @@ dependencies { api(project(':graphql-java-kickstart')) // Servlet - api 'jakarta.servlet:jakarta.servlet-api:6.0.0' + api 'jakarta.servlet:jakarta.servlet-api:5.0.0' api 'jakarta.websocket:jakarta.websocket-api:2.1.0' api 'jakarta.websocket:jakarta.websocket-client-api:2.1.0' implementation "org.slf4j:slf4j-api:$LIB_SLF4J_VER" @@ -40,4 +40,7 @@ dependencies { testImplementation 'org.springframework:spring-test:6.0.7' testRuntimeOnly 'org.springframework:spring-web:6.0.7' testImplementation 'com.google.guava:guava:31.1-jre' + + // Jakarta Servlet API 6.x required only for tests + testImplementation "jakarta.servlet:jakarta.servlet-api:6.0.0" } From ed6008cc4691006939bdfbdad867ed9eb31dc378 Mon Sep 17 00:00:00 2001 From: "Michael H. Siemaszko" Date: Mon, 15 May 2023 01:39:57 +0200 Subject: [PATCH 2/2] Merge remote-tracking branch 'origin/master' into 'jakarta-servlet-5-x' --- graphql-java-servlet/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/graphql-java-servlet/build.gradle b/graphql-java-servlet/build.gradle index 04b07915..94ee2804 100644 --- a/graphql-java-servlet/build.gradle +++ b/graphql-java-servlet/build.gradle @@ -16,9 +16,9 @@ dependencies { api(project(':graphql-java-kickstart')) // Servlet - api 'jakarta.servlet:jakarta.servlet-api:5.0.0' - api 'jakarta.websocket:jakarta.websocket-api:2.1.0' - api 'jakarta.websocket:jakarta.websocket-client-api:2.1.0' + compileOnly 'jakarta.servlet:jakarta.servlet-api:5.0.0' + compileOnly 'jakarta.websocket:jakarta.websocket-api:2.1.0' + compileOnly 'jakarta.websocket:jakarta.websocket-client-api:2.1.0' implementation "org.slf4j:slf4j-api:$LIB_SLF4J_VER" // OSGi