From 6fa38c6908c4501f7f23e426babcdfdfe9aea959 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Wed, 23 Sep 2020 07:39:48 -0400 Subject: [PATCH 1/5] Updating graphql-spring-boot to use graphql-java:15. Dependent on release of graphql-java-servlet (https://github.com/graphql-java-kickstart/graphql-java-servlet/issues/269) --- gradle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 008d63c0..7a715dfc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,10 +39,10 @@ TARGET_COMPATIBILITY = 1.8 ### Dependencies -LIB_GRAPHQL_JAVA_VER = 14.1 -LIB_SPRING_BOOT_VER = 2.3.1.RELEASE -LIB_GRAPHQL_SERVLET_VER = 9.2.0 -LIB_GRAPHQL_JAVA_TOOLS_VER = 6.1.0 +LIB_GRAPHQL_JAVA_VER = 15.0 +LIB_SPRING_BOOT_VER = 2.3.4.RELEASE +LIB_GRAPHQL_SERVLET_VER = 9.3.0-SNAPSHOT +LIB_GRAPHQL_JAVA_TOOLS_VER = 6.2.0 LIB_GRAPHQL_ANNOTATIONS_VER = 8.1 LIB_REFLECTIONS_VER = 0.9.11 LIB_APACHE_COMMONS_TEXT=1.8 From 3ac0662097b225031613ecdc58ffc3f7847e6a95 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 25 Sep 2020 06:45:56 -0400 Subject: [PATCH 2/5] Updating to latest graphql-java-annotations version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7a715dfc..431121eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -43,7 +43,7 @@ LIB_GRAPHQL_JAVA_VER = 15.0 LIB_SPRING_BOOT_VER = 2.3.4.RELEASE LIB_GRAPHQL_SERVLET_VER = 9.3.0-SNAPSHOT LIB_GRAPHQL_JAVA_TOOLS_VER = 6.2.0 -LIB_GRAPHQL_ANNOTATIONS_VER = 8.1 +LIB_GRAPHQL_ANNOTATIONS_VER = 8.2-SNAPSHOT LIB_REFLECTIONS_VER = 0.9.11 LIB_APACHE_COMMONS_TEXT=1.8 LIB_JSOUP_VER=1.13.1 From 55c055ae92fda03c1093df7f260d5574e8f0a423 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 2 Oct 2020 07:47:35 -0400 Subject: [PATCH 3/5] graphql-java-annotations-8.2 now supports graphql-java-15.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 431121eb..8205b472 100644 --- a/gradle.properties +++ b/gradle.properties @@ -43,7 +43,7 @@ LIB_GRAPHQL_JAVA_VER = 15.0 LIB_SPRING_BOOT_VER = 2.3.4.RELEASE LIB_GRAPHQL_SERVLET_VER = 9.3.0-SNAPSHOT LIB_GRAPHQL_JAVA_TOOLS_VER = 6.2.0 -LIB_GRAPHQL_ANNOTATIONS_VER = 8.2-SNAPSHOT +LIB_GRAPHQL_ANNOTATIONS_VER = 8.2 LIB_REFLECTIONS_VER = 0.9.11 LIB_APACHE_COMMONS_TEXT=1.8 LIB_JSOUP_VER=1.13.1 From e1e181cee77037fd95f77562539fde172bd07885 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 2 Oct 2020 07:53:57 -0400 Subject: [PATCH 4/5] graphql-java-servlet-10.0.0 now supports graphql-java-15.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8205b472..19b1f857 100644 --- a/gradle.properties +++ b/gradle.properties @@ -41,7 +41,7 @@ TARGET_COMPATIBILITY = 1.8 LIB_GRAPHQL_JAVA_VER = 15.0 LIB_SPRING_BOOT_VER = 2.3.4.RELEASE -LIB_GRAPHQL_SERVLET_VER = 9.3.0-SNAPSHOT +LIB_GRAPHQL_SERVLET_VER = 10.0.0 LIB_GRAPHQL_JAVA_TOOLS_VER = 6.2.0 LIB_GRAPHQL_ANNOTATIONS_VER = 8.2 LIB_REFLECTIONS_VER = 0.9.11 From 05479543fd1e84e53860ef78ea3405488b20cb21 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 2 Oct 2020 10:10:13 -0400 Subject: [PATCH 5/5] Changing test schema scalar from Long to Float due to the Long scalar being removed from graphql-java-15 and out to graphql-java-extended-scalars (ref https://github.com/graphql-java/graphql-java/releases/tag/v15.0) --- .../src/test/resources/test-schema.graphqls | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/graphql-spring-boot-test/src/test/resources/test-schema.graphqls b/graphql-spring-boot-test/src/test/resources/test-schema.graphqls index 84750b80..2136b747 100644 --- a/graphql-spring-boot-test/src/test/resources/test-schema.graphqls +++ b/graphql-spring-boot-test/src/test/resources/test-schema.graphqls @@ -1,10 +1,8 @@ -scalar Long - type Subscription { - timer: Long! + timer: Float! subscriptionWithParameter(param: String!): String! subscriptionWithInitPayload: String! - subscriptionThatTimesOut: Long! + subscriptionThatTimesOut: Float! subscriptionThatThrowsException: Boolean! }