Merge branch 'master' into schema-parser-options

Author: oliemansm

README.md

@@ -80,19 +80,19 @@ repositories {
 }
 
 dependencies {
-  compile 'com.graphql-java-kickstart:graphql-spring-boot-starter:6.0.0'
+  compile 'com.graphql-java-kickstart:graphql-spring-boot-starter:6.0.1'
   
   // to embed Altair tool
-  runtime 'com.graphql-java-kickstart:altair-spring-boot-starter:6.0.0'
+  runtime 'com.graphql-java-kickstart:altair-spring-boot-starter:6.0.1'
 
   // to embed GraphiQL tool
-  runtime 'com.graphql-java-kickstart:graphiql-spring-boot-starter:6.0.0'
+  runtime 'com.graphql-java-kickstart:graphiql-spring-boot-starter:6.0.1'
 
   // to embed Voyager tool
-  runtime 'com.graphql-java-kickstart:voyager-spring-boot-starter:6.0.0'
+  runtime 'com.graphql-java-kickstart:voyager-spring-boot-starter:6.0.1'
   
   // testing facilities
-  testCompile 'com.graphql-java-kickstart:graphql-spring-boot-starter-test:6.0.0'
+  testCompile 'com.graphql-java-kickstart:graphql-spring-boot-starter-test:6.0.1'
 }
 ```
 
@@ -101,38 +101,38 @@ Maven:
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-spring-boot-starter</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
 </dependency>
 
 <!-- to embed Altair tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>altair-spring-boot-starter</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <scope>runtime</scope>
 </dependency>
 
 <!-- to embed GraphiQL tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphiql-spring-boot-starter</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <scope>runtime</scope>
 </dependency>
 
 <!-- to embed Voyager tool -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>voyager-spring-boot-starter</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <scope>runtime</scope>
 </dependency>
 
 <!-- testing facilities -->
 <dependency>
     <groupId>com.graphql-java-kickstart</groupId>
     <artifactId>graphql-spring-boot-starter-test</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <scope>test</scope>
 </dependency>
 

example-graphql-subscription/src/main/java/com/oembedler/moon/graphql/boot/resolvers/Query.java

@@ -1,6 +1,6 @@
 package com.oembedler.moon.graphql.boot.resolvers;
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver;
+import graphql.kickstart.tools.GraphQLQueryResolver;
 import org.springframework.stereotype.Component;
 
 @Component

example-graphql-subscription/src/main/java/com/oembedler/moon/graphql/boot/resolvers/Subscription.java

@@ -1,6 +1,6 @@
 package com.oembedler.moon.graphql.boot.resolvers;
 
-import com.coxautodev.graphql.tools.GraphQLSubscriptionResolver;
+import graphql.kickstart.tools.GraphQLSubscriptionResolver;
 import com.oembedler.moon.graphql.boot.publishers.StockTickerPublisher;
 import org.reactivestreams.Publisher;
 import org.springframework.stereotype.Component;

example-graphql-tools/src/main/java/com/graphql/sample/boot/Mutation.java

@@ -1,6 +1,6 @@
 package com.graphql.sample.boot;
 
-import com.coxautodev.graphql.tools.GraphQLMutationResolver;
+import graphql.kickstart.tools.GraphQLMutationResolver;
 import java.util.Random;
 import org.springframework.stereotype.Component;
 

example-graphql-tools/src/main/java/com/graphql/sample/boot/PostResolver.java

@@ -1,6 +1,6 @@
 package com.graphql.sample.boot;
 
-import com.coxautodev.graphql.tools.GraphQLResolver;
+import graphql.kickstart.tools.GraphQLResolver;
 import org.springframework.stereotype.Component;
 
 import java.util.Collections;

example-graphql-tools/src/main/java/com/graphql/sample/boot/Query.java

@@ -1,6 +1,6 @@
 package com.graphql.sample.boot;
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver;
+import graphql.kickstart.tools.GraphQLQueryResolver;
 import org.springframework.stereotype.Component;
 
 @Component

example-request-scoped-dataloader/src/main/java/graphql/servlet/examples/dataloader/requestscope/CustomerResolver.java

@@ -1,6 +1,6 @@
 package graphql.servlet.examples.dataloader.requestscope;
 
-import com.coxautodev.graphql.tools.GraphQLResolver;
+import graphql.kickstart.tools.GraphQLResolver;
 import graphql.kickstart.execution.context.GraphQLContext;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;

example-request-scoped-dataloader/src/main/java/graphql/servlet/examples/dataloader/requestscope/WalmartQueryResolver.java

@@ -1,6 +1,6 @@
 package graphql.servlet.examples.dataloader.requestscope;
 
-import com.coxautodev.graphql.tools.GraphQLQueryResolver;
+import graphql.kickstart.tools.GraphQLQueryResolver;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;

gradle.properties

@@ -37,14 +37,14 @@ TARGET_COMPATIBILITY = 1.8
 
 ###
 
-LIB_GRAPHQL_JAVA_VER = 13.0
+LIB_GRAPHQL_JAVA_VER = 14.0
 LIB_JUNIT_VER = 4.12
-LIB_SPRING_CORE_VER = 5.2.1.RELEASE
-LIB_SPRING_BOOT_VER = 2.2.1.RELEASE
+LIB_SPRING_CORE_VER = 5.2.3.RELEASE
+LIB_SPRING_BOOT_VER = 2.2.4.RELEASE
 LIB_GRAPHQL_SERVLET_VER = 9.0.1
-LIB_GRAPHQL_JAVA_TOOLS_VER = 5.7.1
+LIB_GRAPHQL_JAVA_TOOLS_VER = 6.0.0
 LIB_COMMONS_IO_VER = 2.6
-kotlin.version=1.3.31
+kotlin.version=1.3.35
 
 GRADLE_WRAPPER_VER = 4.10.3
 

graphiql-spring-boot-autoconfigure/build.gradle

@@ -23,9 +23,12 @@ dependencies{
     compile "org.apache.commons:commons-text:1.1"
     compileOnly "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
     compileOnly "org.springframework.boot:spring-boot-starter-security:$LIB_SPRING_BOOT_VER"
+    compileOnly "io.projectreactor:reactor-core:3.3.0.RELEASE"
 
     testCompile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
     testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
+
+    testRuntime "org.springframework.boot:spring-boot-starter-webflux:$LIB_SPRING_BOOT_VER"
 }
 
 compileJava.dependsOn(processResources)