Merge remote-tracking branch 'upstream/master'

Author: eduarddrenth

.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

build.gradle

@@ -27,8 +27,8 @@ buildscript {
 }
 
 plugins {
-    id "biz.aQute.bnd.builder" version "6.3.1" apply false
-    id "org.sonarqube" version "3.4.0.2513"
+    id "biz.aQute.bnd.builder" version "6.4.0" apply false
+    id "org.sonarqube" version "3.5.0.2730"
     id "jacoco"
     id "io.github.gradle-nexus.publish-plugin" version '1.1.0'
 }

gradle.properties

@@ -1,4 +1,4 @@
-version=15.0.0-SNAPSHOT
+version=15.0.1-SNAPSHOT
 group=com.graphql-java-kickstart
 PROJECT_NAME=graphql-java-servlet
 PROJECT_DESC=GraphQL Java Kickstart
@@ -7,9 +7,9 @@ PROJECT_LICENSE=MIT
 PROJECT_LICENSE_URL=https://github.com/graphql-java-kickstart/spring-java-servlet/blob/master/LICENSE.md
 PROJECT_DEV_ID=oliemansm
 PROJECT_DEV_NAME=Michiel Oliemans
-LIB_GRAPHQL_JAVA_VER=19.2
-LIB_JACKSON_VER=2.13.4
-LIB_SLF4J_VER=2.0.2
+LIB_GRAPHQL_JAVA_VER=19.3
+LIB_JACKSON_VER=2.14.1
+LIB_SLF4J_VER=2.0.5
 LIB_LOMBOK_VER=1.18.24
 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-kickstart/build.gradle

@@ -14,6 +14,6 @@ dependencies {
     // JSON
     api "com.fasterxml.jackson.core:jackson-core:$LIB_JACKSON_VER"
     api "com.fasterxml.jackson.core:jackson-annotations:$LIB_JACKSON_VER"
-    api "com.fasterxml.jackson.core:jackson-databind:2.13.4"
+    api "com.fasterxml.jackson.core:jackson-databind:2.14.1"
     api "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$LIB_JACKSON_VER"
 }

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

@@ -116,6 +116,9 @@ private void handle(
       response.setStatus(STATUS_INTERNAL_SERVER_ERROR);
       log.error("Cannot handle http request", e);
       listenerHandler.onError(e);
+      if (e instanceof InterruptedException) {
+        Thread.currentThread().interrupt();
+      }
     }
   }