Merge pull request #489 from graphql-java-kickstart/feature/484-upgrade-servlet-spec

Feature/484 upgrade servlet spec

Author: oliemansm

.github/workflows/pull-request.yml

@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        java: [ 17 ]
+        java: [ 17, 19 ]
     needs: validation
     runs-on: ${{ matrix.os }}
     steps:
@@ -60,12 +60,12 @@ jobs:
         if: env.SONAR_TOKEN != null
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         if: env.SONAR_TOKEN != null
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - name: Cache SonarCloud packages
         if: env.SONAR_TOKEN != null
         uses: actions/cache@v3

examples/osgi/pom.xml

@@ -17,8 +17,8 @@
     <graphql.java.servlet.version>11.0.0-SNAPSHOT</graphql.java.servlet.version>
     <graphql.java.version>16.1</graphql.java.version>
     <karaf.version>4.2.10</karaf.version>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+u    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
 
   <version>10.1.0</version>

gradle.properties

@@ -11,5 +11,5 @@ LIB_GRAPHQL_JAVA_VER=19.2
 LIB_JACKSON_VER=2.13.4
 LIB_SLF4J_VER=2.0.2
 LIB_LOMBOK_VER=1.18.24
-SOURCE_COMPATIBILITY=1.8
-TARGET_COMPATIBILITY=1.8
+SOURCE_COMPATIBILITY=17
+TARGET_COMPATIBILITY=17

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

graphql-java-servlet/build.gradle

@@ -16,8 +16,9 @@ dependencies {
     api(project(':graphql-java-kickstart'))
 
     // Servlet
-    api 'javax.servlet:javax.servlet-api:4.0.1'
-    api 'javax.websocket:javax.websocket-api:1.1'
+    api 'jakarta.servlet:jakarta.servlet-api:6.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"
 
     // OSGi
@@ -31,12 +32,12 @@ dependencies {
     testImplementation 'io.github.graphql-java:graphql-java-annotations:8.3'
 
     // Unit testing
-    testImplementation "org.codehaus.groovy:groovy-all:3.0.13"
-    testImplementation "org.spockframework:spock-core:2.1-groovy-3.0"
+    testImplementation "org.apache.groovy:groovy-all:4.0.6"
+    testImplementation "org.spockframework:spock-core:2.3-groovy-4.0"
     testRuntimeOnly "cglib:cglib-nodep:3.3.0"
     testRuntimeOnly "org.objenesis:objenesis:3.3"
     testImplementation "org.slf4j:slf4j-simple:$LIB_SLF4J_VER"
-    testImplementation 'org.springframework:spring-test:5.3.23'
-    testRuntimeOnly 'org.springframework:spring-web:5.3.23'
+    testImplementation 'org.springframework:spring-test:6.0.2'
+    testRuntimeOnly 'org.springframework:spring-web:6.0.2'
     testImplementation 'com.google.guava:guava:31.1-jre'
 }

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/AbstractGraphQLHttpServlet.java

@@ -8,10 +8,10 @@
 import graphql.kickstart.servlet.core.GraphQLMBean;
 import graphql.kickstart.servlet.core.GraphQLServletListener;
 import graphql.schema.GraphQLFieldDefinition;
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 
 /** @author Andrew Potter */

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/AsyncTimeoutListener.java

@@ -1,8 +1,8 @@
 package graphql.kickstart.servlet;
 
 import java.io.IOException;
-import javax.servlet.AsyncEvent;
-import javax.servlet.AsyncListener;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
 
 interface AsyncTimeoutListener extends AsyncListener {
 

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/BatchedQueryResponseWriter.java

@@ -6,8 +6,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/ErrorQueryResponseWriter.java

@@ -1,8 +1,8 @@
 package graphql.kickstart.servlet;
 
 import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/ExecutionResultSubscriber.java

@@ -6,7 +6,7 @@
 import java.io.Writer;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.servlet.AsyncContext;
+import jakarta.servlet.AsyncContext;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;