From 645cf21f179a25c997eb1751cfc0049e4c66836d Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Wed, 14 Apr 2021 21:24:04 +0100
Subject: [PATCH] Update dependencies

---
 graphql-spring-boot-starter/build.gradle |  5 ++---
 samples/webflux-websocket/build.gradle   |  4 ++--
 samples/webmvc-http/build.gradle         |  4 ++--
 spring-graphql-web/build.gradle          | 21 +++++++++------------
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/graphql-spring-boot-starter/build.gradle b/graphql-spring-boot-starter/build.gradle
index cecd1cd5..3bff3a5a 100644
--- a/graphql-spring-boot-starter/build.gradle
+++ b/graphql-spring-boot-starter/build.gradle
@@ -1,7 +1,7 @@
 import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 plugins {
-	id 'org.springframework.boot' version '2.4.1' apply false
+	id 'org.springframework.boot' version '2.4.4' apply false
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id 'java-library'
 	id 'maven'
@@ -25,8 +25,7 @@ dependencyManagement {
 
 dependencies {
 	api project(':spring-graphql-web')
-	api 'com.graphql-java:graphql-java:15.0'
-	// Reactor is required as it's part of the interception model
+	api 'com.graphql-java:graphql-java:16.2'
 	api 'io.projectreactor:reactor-core'
 	api 'org.springframework:spring-context'
 	api 'org.springframework.boot:spring-boot-starter'
diff --git a/samples/webflux-websocket/build.gradle b/samples/webflux-websocket/build.gradle
index 5994e94d..fa8ce2d7 100644
--- a/samples/webflux-websocket/build.gradle
+++ b/samples/webflux-websocket/build.gradle
@@ -1,11 +1,11 @@
 plugins {
-	id 'org.springframework.boot' version '2.4.1'
+	id 'org.springframework.boot' version '2.4.4'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id 'java'
 }
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
-description = "GraphQL over WebSocket sample"
+description = "GraphQL over WebSocket With Spring WebFlux Sample"
 sourceCompatibility = '1.8'
 
 dependencies {
diff --git a/samples/webmvc-http/build.gradle b/samples/webmvc-http/build.gradle
index cfa83f51..e7c0b87c 100644
--- a/samples/webmvc-http/build.gradle
+++ b/samples/webmvc-http/build.gradle
@@ -1,11 +1,11 @@
 plugins {
-	id 'org.springframework.boot' version '2.4.1'
+	id 'org.springframework.boot' version '2.4.4'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id 'java'
 }
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
-description = "GraphQL sample application"
+description = "GraphQL over HTTP with Spring MVC Sample"
 sourceCompatibility = '1.8'
 
 dependencies {
diff --git a/spring-graphql-web/build.gradle b/spring-graphql-web/build.gradle
index a6a7d11a..e37fcb9d 100644
--- a/spring-graphql-web/build.gradle
+++ b/spring-graphql-web/build.gradle
@@ -5,7 +5,7 @@ plugins {
 	id 'maven'
 }
 
-description = "GraphQL Java support with Spring Web frameworks"
+description = "Spring MVC and Spring WebFlux GraphQL Support"
 
 java {
 	sourceCompatibility = JavaVersion.VERSION_1_8
@@ -14,9 +14,9 @@ java {
 
 dependencyManagement {
 	imports {
-        mavenBom "com.fasterxml.jackson:jackson-bom:2.12.0"
-        mavenBom "io.projectreactor:reactor-bom:2020.0.2"
-		mavenBom "org.springframework:spring-framework-bom:5.3.2"
+        mavenBom "com.fasterxml.jackson:jackson-bom:2.12.3"
+        mavenBom "io.projectreactor:reactor-bom:2020.0.6"
+		mavenBom "org.springframework:spring-framework-bom:5.3.6"
 	}
 	generatedPomCustomization {
 		enabled = false
@@ -25,7 +25,6 @@ dependencyManagement {
 
 dependencies {
 	api 'com.graphql-java:graphql-java:16.2'
-	// Reactor is required as it's part of the interception model
 	api 'io.projectreactor:reactor-core'
 	api 'org.springframework:spring-context'
 
@@ -35,19 +34,17 @@ dependencies {
 	compileOnly 'org.springframework:spring-websocket'
 	compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
 
-	testImplementation 'com.fasterxml.jackson.core:jackson-databind'
+	testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
+	testImplementation 'org.assertj:assertj-core:3.19.0'
+	testImplementation 'com.jayway.jsonpath:json-path:2.5.0'
+	testImplementation 'org.skyscreamer:jsonassert:1.5.0'
 	testImplementation 'org.springframework:spring-webflux'
 	testImplementation 'org.springframework:spring-webmvc'
 	testImplementation 'org.springframework:spring-websocket'
 	testImplementation 'org.springframework:spring-test'
 	testImplementation 'io.projectreactor:reactor-test'
 	testImplementation 'javax.servlet:javax.servlet-api:4.0.1'
-
-    testImplementation 'com.jayway.jsonpath:json-path:2.4.0'
-    testImplementation 'org.assertj:assertj-core:3.18.1'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.7.0'
-    testImplementation 'org.skyscreamer:jsonassert:1.5.0'
-    testImplementation 'org.springframework:spring-test'
+	testImplementation 'com.fasterxml.jackson.core:jackson-databind'
 }
 
 test {