Merge remote-tracking branch 'origin/master'

Author: oliemansm

gradle.properties

@@ -37,7 +37,8 @@ LIB_GRAPHQL_SERVLET_VER=11.1.1
 LIB_GRAPHQL_JAVA_TOOLS_VER=11.0.1
 LIB_GRAPHQL_ANNOTATIONS_VER=8.3
 LIB_REFLECTIONS_VER=0.9.11
-LIB_APACHE_COMMONS_TEXT=1.9
+LIB_APACHE_COMMONS_TEXT_VER=1.9
+LIB_AWAITILITY_VER=4.1.0
 LIB_JSOUP_VER=1.13.1
 ### Plugins
 PLUGIN_JACOCO_VER=0.8.7

graphql-spring-boot-autoconfigure/build.gradle

@@ -34,7 +34,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-validation"
 
     // graphiql
-    implementation "org.apache.commons:commons-text:$LIB_APACHE_COMMONS_TEXT"
+    implementation "org.apache.commons:commons-text:$LIB_APACHE_COMMONS_TEXT_VER"
     compileOnly "org.springframework.boot:spring-boot-starter-security"
 
     compileOnly "org.springframework.boot:spring-boot-starter-websocket"

graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/annotations/test/interfaces/Car.java

@@ -13,7 +13,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-// “implements Vehicle” has to be repeated here although already inherited from AbstractVehicle
+// "implements Vehicle" has to be repeated here although already inherited from AbstractVehicle
 // because otherwise GraphQL-Java Annotations would not find this class.
 public class Car extends AbstractVehicle implements Vehicle {
 

graphql-spring-boot-test/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-test")
     implementation("com.fasterxml.jackson.core:jackson-databind")
     implementation("com.jayway.jsonpath:json-path")
-    implementation 'org.awaitility:awaitility:4.1.0'
+    implementation "org.awaitility:awaitility:$LIB_AWAITILITY_VER"
     compileOnly("com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER")
     compileOnly("com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER")
     testImplementation("org.springframework.boot:spring-boot-starter-web")