diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
new file mode 100644
index 00000000..c354d462
--- /dev/null
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
\ No newline at end of file
diff --git a/altair-spring-boot-autoconfigure/build.gradle b/altair-spring-boot-autoconfigure/build.gradle
index 01e22f37..93a0ca6f 100644
--- a/altair-spring-boot-autoconfigure/build.gradle
+++ b/altair-spring-boot-autoconfigure/build.gradle
@@ -17,14 +17,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies{
-    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
     
-    compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
-    compile "org.apache.commons:commons-text:1.1"
-    compileOnly "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
+    implementation "org.apache.commons:commons-text:$LIB_APACHE_COMMONS_TEXT"
+    compileOnly "org.springframework.boot:spring-boot-starter-web"
 
-    testCompile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
-    testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
+    testImplementation "org.springframework.boot:spring-boot-starter-web"
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
 }
 
 compileJava.dependsOn(processResources)
diff --git a/altair-spring-boot-starter/build.gradle b/altair-spring-boot-starter/build.gradle
index d03e3ded..60e00e97 100644
--- a/altair-spring-boot-starter/build.gradle
+++ b/altair-spring-boot-starter/build.gradle
@@ -17,5 +17,5 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies {
-    compile(project(':altair-spring-boot-autoconfigure'))
+    implementation(project(':altair-spring-boot-autoconfigure'))
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d3a03cb8..71f4c395 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,35 +17,21 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-buildscript {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        jcenter()
-        maven { url "https://dl.bintray.com/graphql-java-kickstart/releases" }
-        maven { url "https://plugins.gradle.org/m2/" }
-        maven { url 'https://repo.spring.io/plugins-release' }
-    }
-    dependencies {
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
-        classpath 'net.researchgate:gradle-release:2.7.0'
-    }
-}
-
 plugins {
-    id 'net.researchgate.release' version '2.7.0'
-    id 'io.franzbecker.gradle-lombok' version '1.14' apply false
+    id "com.jfrog.bintray" version "$LIB_BINTRAY_PLUGIN_VER"
+    id 'net.researchgate.release' version "$LIB_RELEASE_PLUGIN_VER"
+    id "org.springframework.boot" version "$LIB_SPRING_BOOT_VER" apply false
 }
 
 subprojects {
     apply plugin: 'idea'
     apply plugin: 'java'
-    apply plugin: 'maven'
+    apply plugin: 'java-library'
     apply plugin: 'maven-publish'
     apply plugin: "com.jfrog.bintray"
-    apply plugin: 'io.franzbecker.gradle-lombok'
+    apply plugin: "io.spring.dependency-management"
 
-    group = PROJECT_GROUP
+    group  "$PROJECT_GROUP"
 
     repositories {
         mavenLocal()
@@ -56,6 +42,24 @@ subprojects {
         maven { url "https://repo.spring.io/libs-milestone" }
     }
 
+    dependencyManagement {
+        imports {
+            mavenBom "org.springframework.boot:spring-boot-starter-parent:$LIB_SPRING_BOOT_VER"
+        }
+    }
+
+    dependencies {
+        compileOnly "org.projectlombok:lombok"
+        annotationProcessor "org.projectlombok:lombok"
+
+        testCompileOnly "org.projectlombok:lombok"
+        testAnnotationProcessor "org.projectlombok:lombok"
+    }
+
+    test {
+        useJUnitPlatform()
+    }
+
     idea {
         module {
             downloadJavadoc = true
@@ -69,80 +73,60 @@ subprojects {
     }
 
     compileJava.dependsOn(processResources)
-    
-    lombok {
-        version = "1.18.4"
-        sha256 = ""
-    }
-
 
     if (!it.name.startsWith('example')) {
 
-        jar {
-            from "LICENSE.md"
-        }
-
-        task sourcesJar(type: Jar) {
-            dependsOn classes
-            classifier 'sources'
-            from sourceSets.main.allSource
+        //disable Gradle Metadata generation as it may cause unwanted side effects
+        tasks.withType(GenerateModuleMetadata) {
+            enabled = false
         }
 
-        task javadocJar(type: Jar, dependsOn: javadoc) {
-            classifier = 'javadoc'
-            from javadoc.destinationDir
+        jar {
+            from "LICENSE.md"
         }
 
-        artifacts {
-            archives sourcesJar
-            archives javadocJar
+        java {
+            withSourcesJar()
+            withJavadocJar()
         }
 
         publishing {
             publications {
                 mainProjectPublication(MavenPublication) {
-                    version version
                     from components.java
 
-                    artifact sourcesJar {
-                        classifier "sources"
-                    }
-                    artifact javadocJar {
-                        classifier "javadoc"
+                    // to avoid "Publication only contains dependencies and/or constraints without a version" error
+                    // see https://docs.gradle.org/6.2.1/userguide/publishing_maven.html#publishing_maven:resolved_dependencies
+                    versionMapping {
+                        usage('java-api') {
+                            fromResolutionOf('runtimeClasspath')
+                        }
+                        usage('java-runtime') {
+                            fromResolutionResult()
+                        }
                     }
 
-                    pom.withXml {
-                        // Fix dependency scoping.
-                        asNode().dependencies.'*'.findAll() {
-                            it.scope.text() == 'runtime' && project.configurations.compile.allDependencies.find { dep ->
-                                dep.name == it.artifactId.text()
-                            }
-                        }.each() {
-                            it.scope*.value = 'compile'
+                    pom {
+                        resolveStrategy = DELEGATE_FIRST
+                        name = PROJECT_NAME
+                        description = PROJECT_DESC
+                        url = PROJECT_GIT_REPO_URL
+                        scm {
+                            url = PROJECT_GIT_REPO_URL
+                            connection = PROJECT_GIT_REPO_URL
+                            developerConnection = PROJECT_GIT_REPO_URL
                         }
-
-                        asNode().children().last() + {
-                            resolveStrategy = Closure.DELEGATE_FIRST
-                            name PROJECT_NAME
-                            description PROJECT_DESC
-                            url PROJECT_GIT_REPO_URL
-                            scm {
-                                url PROJECT_GIT_REPO_URL
-                                connection PROJECT_GIT_REPO_URL
-                                developerConnection PROJECT_GIT_REPO_URL
+                        licenses {
+                            license {
+                                name = PROJECT_LICENSE
+                                url = PROJECT_LICENSE_URL
+                                distribution = 'repo'
                             }
-                            licenses {
-                                license {
-                                    name PROJECT_LICENSE
-                                    url PROJECT_LICENSE_URL
-                                    distribution 'repo'
-                                }
-                            }
-                            developers {
-                                developer {
-                                    id PROJECT_DEV_ID
-                                    name PROJECT_DEV_NAME
-                                }
+                        }
+                        developers {
+                            developer {
+                                id = PROJECT_DEV_ID
+                                name = PROJECT_DEV_NAME
                             }
                         }
                     }
@@ -199,6 +183,6 @@ task build {
     dependsOn subprojects.findResults { it.tasks.findByName('bintray') }
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = "${GRADLE_WRAPPER_VER}"
+wrapper {
+    distributionType = Wrapper.DistributionType.ALL
 }
diff --git a/example-graphql-subscription/build.gradle b/example-graphql-subscription/build.gradle
index b2ea698e..4df3157a 100644
--- a/example-graphql-subscription/build.gradle
+++ b/example-graphql-subscription/build.gradle
@@ -1,28 +1,16 @@
-plugins {
-    id 'java'
-    id 'org.springframework.boot' version '2.1.3.RELEASE'
-}
-
-sourceCompatibility = 1.8
-
-repositories {
-    jcenter()
-    mavenCentral()
-}
-
 dependencies {
-    compile(project(":graphql-spring-boot-starter"))
-    compile(project(":graphiql-spring-boot-starter"))
-    compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
+    implementation(project(":graphql-spring-boot-starter"))
+    implementation(project(":graphiql-spring-boot-starter"))
+    implementation "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
 
-    compile "io.reactivex.rxjava2:rxjava:2.1.5"
-    compile "io.projectreactor:reactor-core:3.3.2.RELEASE"
-    compile("org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER")
+    implementation "io.reactivex.rxjava2:rxjava"
+    implementation "io.projectreactor:reactor-core"
+    implementation("org.springframework.boot:spring-boot-starter-web")
 
-    testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
 }
 
 jar.enabled = false
 uploadArchives.enabled = false
 bintrayUpload.enabled = false
-install.enabled = false
+publishToMavenLocal.enabled = false
diff --git a/example-graphql-tools/build.gradle b/example-graphql-tools/build.gradle
index 0222cea8..9fcdbc74 100644
--- a/example-graphql-tools/build.gradle
+++ b/example-graphql-tools/build.gradle
@@ -16,30 +16,21 @@
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-plugins {
-    id 'java'
-}
-
-sourceCompatibility = 1.8
-
-repositories {
-    mavenCentral()
-}
 
 dependencies {
-    compile(project(":graphql-spring-boot-starter"))
-    compile(project(":graphiql-spring-boot-starter"))
-    compile(project(":voyager-spring-boot-starter"))
-    compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
+    implementation(project(":graphql-spring-boot-starter"))
+    implementation(project(":graphiql-spring-boot-starter"))
+    implementation(project(":voyager-spring-boot-starter"))
+    implementation "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
 
-    compile("org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER")
+    implementation("org.springframework.boot:spring-boot-starter-web")
 
-    testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
 
-    testCompile(project(":graphql-spring-boot-starter-test"))
+    testImplementation(project(":graphql-spring-boot-starter-test"))
 }
 
 jar.enabled = false
 uploadArchives.enabled = false
 bintrayUpload.enabled = false
-install.enabled = false
+publishToMavenLocal.enabled = false
diff --git a/example-request-scoped-dataloader/build.gradle b/example-request-scoped-dataloader/build.gradle
index c6ecf93b..8edc0368 100644
--- a/example-request-scoped-dataloader/build.gradle
+++ b/example-request-scoped-dataloader/build.gradle
@@ -1,25 +1,15 @@
-plugins {
-    id 'java'
-}
-
-sourceCompatibility = 1.8
-
-repositories {
-    mavenCentral()
-}
-
 dependencies {
-    compile("org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER")
-    compile(project(":graphql-spring-boot-starter"))
-    compile(project(":graphiql-spring-boot-starter"))
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation(project(":graphql-spring-boot-starter"))
+    implementation(project(":graphiql-spring-boot-starter"))
 
-    compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
+    implementation "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
 
-    testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
-    testCompile(project(":graphql-spring-boot-starter-test"))
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
+    testImplementation(project(":graphql-spring-boot-starter-test"))
 }
 
 jar.enabled = false
 uploadArchives.enabled = false
 bintrayUpload.enabled = false
-install.enabled = false
\ No newline at end of file
+publishToMavenLocal.enabled = false
\ No newline at end of file
diff --git a/example-spring-common/build.gradle b/example-spring-common/build.gradle
index 3cfe7402..b97636ff 100644
--- a/example-spring-common/build.gradle
+++ b/example-spring-common/build.gradle
@@ -16,36 +16,20 @@
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-buildscript {
-    repositories {
-        maven { url "https://plugins.gradle.org/m2/" }
-        maven { url 'https://repo.spring.io/plugins-release' }
-    }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.2.RELEASE")
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6"
-    }
-}
 
-apply plugin: 'java'
-apply plugin: 'war'
 apply plugin: 'org.springframework.boot'
 
-repositories {
-    jcenter()
-}
-
 dependencies{
-    compile(project(":graphql-spring-boot-starter"))
-    compile(project(":graphiql-spring-boot-starter"))
+    implementation(project(":graphql-spring-boot-starter"))
+    implementation(project(":graphiql-spring-boot-starter"))
 
-    compile "com.embedler.moon.graphql:spring-graphql-common:2.1.0-2016-05-22T16-50-32"
-    compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.3'
+    implementation "com.embedler.moon.graphql:spring-graphql-common:2.1.0-2016-05-22T16-50-32"
+    implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.3'
 
-    compile("org.springframework.boot:spring-boot-starter-web")
-    compile("org.springframework.boot:spring-boot-starter-actuator")
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-actuator")
 
-    testCompile("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
 }
 
 jar.enabled = false
diff --git a/example-webflux/build.gradle b/example-webflux/build.gradle
index b8290a55..187a3043 100644
--- a/example-webflux/build.gradle
+++ b/example-webflux/build.gradle
@@ -16,24 +16,6 @@
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-buildscript {
-    repositories {
-        maven { url "https://plugins.gradle.org/m2/" }
-        maven { url 'https://repo.spring.io/plugins-release' }
-    }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:$LIB_SPRING_BOOT_VER")
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6"
-    }
-}
-
-apply plugin: 'java'
-apply plugin: 'org.springframework.boot'
-
-repositories {
-    mavenLocal()
-    jcenter()
-}
 
 dependencies {
     compile(project(":graphql-kickstart-spring-boot-autoconfigure-webflux"))
@@ -47,4 +29,4 @@ dependencies {
 jar.enabled = false
 uploadArchives.enabled = false
 bintrayUpload.enabled = false
-install.enabled = false
+publishToMavenLocal.enabled = false
diff --git a/example/build.gradle b/example/build.gradle
index 25c68cff..05b0e4fc 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -16,37 +16,19 @@
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-buildscript {
-    repositories {
-        maven { url "https://plugins.gradle.org/m2/" }
-        maven { url 'https://repo.spring.io/plugins-release' }
-    }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:$LIB_SPRING_BOOT_VER")
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6"
-    }
-}
-
-apply plugin: 'java'
-apply plugin: 'org.springframework.boot'
-
-repositories {
-    mavenLocal()
-    jcenter()
-}
 
 dependencies{
-    compile(project(":altair-spring-boot-starter"))
-    compile(project(":graphql-spring-boot-starter"))
-    compile(project(":graphiql-spring-boot-starter"))
-    compile(project(":voyager-spring-boot-starter"))
-    compile(project(":playground-spring-boot-starter"))
-    
-    compile("org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER")
-    compile("org.springframework.boot:spring-boot-starter-actuator:$LIB_SPRING_BOOT_VER")
+    implementation(project(":altair-spring-boot-starter"))
+    implementation(project(":graphql-spring-boot-starter"))
+    implementation(project(":graphiql-spring-boot-starter"))
+    implementation(project(":voyager-spring-boot-starter"))
+    implementation(project(":playground-spring-boot-starter"))
+
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-actuator")
 }
 
 jar.enabled = false
 uploadArchives.enabled = false
 bintrayUpload.enabled = false
-install.enabled = false
+publishToMavenLocal.enabled = false
diff --git a/gradle.properties b/gradle.properties
index 37664f13..de02b94b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,6 +19,8 @@
 
 version = 6.0.1
 
+### Project Metadata
+
 PROJECT_GROUP = com.graphql-java-kickstart
 PROJECT_NAME = graphql-spring-boot
 PROJECT_DESC = GraphQL Spring Framework Boot
@@ -35,18 +37,20 @@ VCS=Git
 SOURCE_COMPATIBILITY = 1.8
 TARGET_COMPATIBILITY = 1.8
 
-###
+### Dependencies
 
 LIB_GRAPHQL_JAVA_VER = 14.0
-LIB_JUNIT_VER = 4.12
-LIB_SPRING_CORE_VER = 5.2.3.RELEASE
-LIB_SPRING_BOOT_VER = 2.2.4.RELEASE
+LIB_SPRING_BOOT_VER = 2.2.5.RELEASE
 LIB_GRAPHQL_SERVLET_VER = 9.0.1
 LIB_GRAPHQL_JAVA_TOOLS_VER = 6.0.0
-LIB_COMMONS_IO_VER = 2.6
-kotlin.version=1.3.35
+LIB_APACHE_COMMONS_TEXT=1.8
+LIB_JSOUP_VER=1.12.2
+kotlin.version=1.3.61
+
+### Gradle Plugins
 
-GRADLE_WRAPPER_VER = 4.10.3
+LIB_BINTRAY_PLUGIN_VER=1.8.4
+LIB_RELEASE_PLUGIN_VER=2.8.1
 
 ###
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 91ca28c8..f3d88b1c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 68e773ba..84a90661 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Jun 03 22:34:30 HKT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
diff --git a/gradlew b/gradlew
index cccdd3d5..2fe81a7d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index e95643d6..9109989e 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/graphiql-spring-boot-autoconfigure/build.gradle b/graphiql-spring-boot-autoconfigure/build.gradle
index efe5e17d..76c43043 100644
--- a/graphiql-spring-boot-autoconfigure/build.gradle
+++ b/graphiql-spring-boot-autoconfigure/build.gradle
@@ -17,18 +17,18 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies{
-    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
 
-    compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
-    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"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
+    implementation "org.apache.commons:commons-text:$LIB_APACHE_COMMONS_TEXT"
+    compileOnly "org.springframework.boot:spring-boot-starter-web"
+    compileOnly "org.springframework.boot:spring-boot-starter-security"
+    compileOnly "io.projectreactor:reactor-core"
 
-    testCompile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
-    testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
+    testImplementation "org.springframework.boot:spring-boot-starter-web"
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
 
-    testRuntime "org.springframework.boot:spring-boot-starter-webflux:$LIB_SPRING_BOOT_VER"
+    testRuntimeOnly "org.springframework.boot:spring-boot-starter-webflux"
 }
 
 compileJava.dependsOn(processResources)
diff --git a/graphiql-spring-boot-starter/build.gradle b/graphiql-spring-boot-starter/build.gradle
index 015eb0ac..125302b5 100644
--- a/graphiql-spring-boot-starter/build.gradle
+++ b/graphiql-spring-boot-starter/build.gradle
@@ -17,5 +17,5 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies {
-    compile(project(':graphiql-spring-boot-autoconfigure'))
+    implementation(project(':graphiql-spring-boot-autoconfigure'))
 }
\ No newline at end of file
diff --git a/graphql-kickstart-spring-boot-autoconfigure-tools/build.gradle b/graphql-kickstart-spring-boot-autoconfigure-tools/build.gradle
index 0c152564..305b4b74 100644
--- a/graphql-kickstart-spring-boot-autoconfigure-tools/build.gradle
+++ b/graphql-kickstart-spring-boot-autoconfigure-tools/build.gradle
@@ -1,17 +1,17 @@
 dependencies {
-    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
-    compileOnly "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
+    compileOnly "org.springframework.boot:spring-boot-configuration-processor"
 
-    compile "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
-    compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
+    api "com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
 
     compileOnly "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
 
-    testCompile "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
-    testCompile "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
-    testCompile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
-    testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
-    testCompile(project(":graphql-spring-boot-test"))
+    testImplementation "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
+    testImplementation "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
+    testImplementation "org.springframework.boot:spring-boot-starter-web"
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
+    testImplementation(project(":graphql-spring-boot-test"))
 }
 
 compileJava.dependsOn(processResources)
diff --git a/graphql-kickstart-spring-boot-autoconfigure-webflux/build.gradle b/graphql-kickstart-spring-boot-autoconfigure-webflux/build.gradle
index ddecf787..bdbb9296 100644
--- a/graphql-kickstart-spring-boot-autoconfigure-webflux/build.gradle
+++ b/graphql-kickstart-spring-boot-autoconfigure-webflux/build.gradle
@@ -1,8 +1,8 @@
 dependencies {
-    compile(project(':graphql-kickstart-spring-webflux'))
+    implementation(project(':graphql-kickstart-spring-webflux'))
     compileOnly(project(":graphql-kickstart-spring-boot-starter-tools"))
 
-    compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
-    compile "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
-    compile "org.springframework.boot:spring-boot-starter-webflux:$LIB_SPRING_BOOT_VER"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
+    implementation "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
+    implementation "org.springframework.boot:spring-boot-starter-webflux"
 }
diff --git a/graphql-kickstart-spring-boot-starter-tools/build.gradle b/graphql-kickstart-spring-boot-starter-tools/build.gradle
index 2a84ca7c..0d003588 100644
--- a/graphql-kickstart-spring-boot-starter-tools/build.gradle
+++ b/graphql-kickstart-spring-boot-starter-tools/build.gradle
@@ -17,5 +17,5 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies {
-    compile(project(':graphql-kickstart-spring-boot-autoconfigure-tools'))
+    api(project(':graphql-kickstart-spring-boot-autoconfigure-tools'))
 }
diff --git a/graphql-kickstart-spring-boot-starter-webflux/build.gradle b/graphql-kickstart-spring-boot-starter-webflux/build.gradle
index 1cee8bbd..bb0d3c3e 100644
--- a/graphql-kickstart-spring-boot-starter-webflux/build.gradle
+++ b/graphql-kickstart-spring-boot-starter-webflux/build.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    compile(project(':graphql-kickstart-spring-boot-autoconfigure-webflux'))
+    implementation(project(':graphql-kickstart-spring-boot-autoconfigure-webflux'))
 }
diff --git a/graphql-kickstart-spring-support/build.gradle b/graphql-kickstart-spring-support/build.gradle
index aa1bb540..c6acf56d 100644
--- a/graphql-kickstart-spring-support/build.gradle
+++ b/graphql-kickstart-spring-support/build.gradle
@@ -1,12 +1,12 @@
 dependencies {
     compileOnly "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
-    compileOnly "org.springframework:spring-web:$LIB_SPRING_CORE_VER"
-    compileOnly "org.springframework:spring-context:$LIB_SPRING_CORE_VER"
-    compileOnly "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
+    compileOnly "org.springframework:spring-web"
+    compileOnly "org.springframework:spring-context"
+    compileOnly "org.springframework.boot:spring-boot-starter-web"
 
-    testCompile "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
-    testCompile "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
-    testCompile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
-    testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
-    testCompile(project(":graphql-spring-boot-test"))
+    testImplementation "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
+    testImplementation "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
+    testImplementation "org.springframework.boot:spring-boot-starter-web"
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
+    testImplementation(project(":graphql-spring-boot-test"))
 }
diff --git a/graphql-kickstart-spring-webflux/build.gradle b/graphql-kickstart-spring-webflux/build.gradle
index 2a6afaed..b1c84789 100644
--- a/graphql-kickstart-spring-webflux/build.gradle
+++ b/graphql-kickstart-spring-webflux/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
-    compile(project(':graphql-kickstart-spring-support'))
+    api(project(':graphql-kickstart-spring-support'))
 
     compileOnly "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
-    compileOnly "org.springframework.boot:spring-boot-starter-webflux:$LIB_SPRING_BOOT_VER"
+    compileOnly "org.springframework.boot:spring-boot-starter-webflux"
 }
diff --git a/graphql-spring-boot-autoconfigure/build.gradle b/graphql-spring-boot-autoconfigure/build.gradle
index 2ff7a914..9aa3e005 100644
--- a/graphql-spring-boot-autoconfigure/build.gradle
+++ b/graphql-spring-boot-autoconfigure/build.gradle
@@ -18,24 +18,24 @@
  */
 
 dependencies {
-    compile(project(":graphql-kickstart-spring-boot-starter-tools"))
-    compile(project(":graphql-kickstart-spring-support"))
-    compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
-    compile "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
-    compile "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
+    api(project(":graphql-kickstart-spring-boot-starter-tools"))
+    api(project(":graphql-kickstart-spring-support"))
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
+    api "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER"
+    api "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER"
 
-    compile "org.springframework.boot:spring-boot-starter-websocket:$LIB_SPRING_BOOT_VER"
-    compile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
-    compile "org.springframework.boot:spring-boot-starter-actuator:$LIB_SPRING_BOOT_VER"
+    implementation "org.springframework.boot:spring-boot-starter-websocket"
+    implementation "org.springframework.boot:spring-boot-starter-web"
+    implementation "org.springframework.boot:spring-boot-starter-actuator"
 
-    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
-    compileOnly "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
-    compileOnly "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
+    compileOnly "org.springframework.boot:spring-boot-configuration-processor"
+    compileOnly "org.springframework.boot:spring-boot-starter-web"
 
-    testCompile "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
-    testCompile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
-    testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
-    testCompile(project(":graphql-spring-boot-test"))
+    testImplementation "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
+    testImplementation "org.springframework.boot:spring-boot-starter-web"
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
+    testImplementation(project(":graphql-spring-boot-test"))
 }
 
 compileJava.dependsOn(processResources)
diff --git a/graphql-spring-boot-starter-test/build.gradle b/graphql-spring-boot-starter-test/build.gradle
index 165e10b6..e2d3857d 100644
--- a/graphql-spring-boot-starter-test/build.gradle
+++ b/graphql-spring-boot-starter-test/build.gradle
@@ -17,5 +17,5 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies {
-    compile(project(':graphql-spring-boot-test-autoconfigure'))
+    api(project(':graphql-spring-boot-test-autoconfigure'))
 }
diff --git a/graphql-spring-boot-starter/build.gradle b/graphql-spring-boot-starter/build.gradle
index 7e7f32aa..e9bd5af3 100644
--- a/graphql-spring-boot-starter/build.gradle
+++ b/graphql-spring-boot-starter/build.gradle
@@ -17,5 +17,5 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies {
-    compile(project(':graphql-spring-boot-autoconfigure'))
+    api(project(':graphql-spring-boot-autoconfigure'))
 }
\ No newline at end of file
diff --git a/graphql-spring-boot-test-autoconfigure/build.gradle b/graphql-spring-boot-test-autoconfigure/build.gradle
index dc46d32b..ee5f23f6 100644
--- a/graphql-spring-boot-test-autoconfigure/build.gradle
+++ b/graphql-spring-boot-test-autoconfigure/build.gradle
@@ -18,14 +18,14 @@
  */
 
 dependencies {
-    compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
-    compile("org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER")
-    compile(project(":graphql-spring-boot-test"))
-    compile(project(":graphql-spring-boot-starter"))
-    compile(project(":graphql-kickstart-spring-boot-starter-tools"))
-    compile("org.springframework.boot:spring-boot-starter-actuator:$LIB_SPRING_BOOT_VER")
-    compile("org.springframework.boot:spring-boot-starter-websocket:$LIB_SPRING_BOOT_VER")
-    compile("com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER")
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
+    implementation("org.springframework.boot:spring-boot-starter-test")
+    api(project(":graphql-spring-boot-test"))
+    implementation(project(":graphql-spring-boot-starter"))
+    implementation(project(":graphql-kickstart-spring-boot-starter-tools"))
+    implementation("org.springframework.boot:spring-boot-starter-actuator")
+    implementation("org.springframework.boot:spring-boot-starter-websocket")
+    implementation("com.graphql-java-kickstart:graphql-java-tools:$LIB_GRAPHQL_JAVA_TOOLS_VER")
 }
 
 compileJava.dependsOn(processResources)
diff --git a/graphql-spring-boot-test/build.gradle b/graphql-spring-boot-test/build.gradle
index 15b2899f..1c471cf8 100644
--- a/graphql-spring-boot-test/build.gradle
+++ b/graphql-spring-boot-test/build.gradle
@@ -17,18 +17,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies {
-    compile("org.springframework:spring-web:$LIB_SPRING_CORE_VER")
-    compile("org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER")
-    compile("com.fasterxml.jackson.core:jackson-databind:2.10.2")
-    compile("com.jayway.jsonpath:json-path:2.4.0")
+    implementation("org.springframework:spring-web")
+    implementation("org.springframework.boot:spring-boot-starter-test")
+    implementation("com.fasterxml.jackson.core:jackson-databind")
+    implementation("com.jayway.jsonpath:json-path")
     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:$LIB_SPRING_BOOT_VER")
-}
-repositories {
-    mavenCentral()
-}
-
-test {
-    useJUnitPlatform()
+    testImplementation("org.springframework.boot:spring-boot-starter-web")
 }
diff --git a/playground-spring-boot-autoconfigure/build.gradle b/playground-spring-boot-autoconfigure/build.gradle
index e91b2667..a17123eb 100644
--- a/playground-spring-boot-autoconfigure/build.gradle
+++ b/playground-spring-boot-autoconfigure/build.gradle
@@ -17,16 +17,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies{
-    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
     
-    compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
-    compile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
-    compile "org.springframework.boot:spring-boot-starter-thymeleaf:$LIB_SPRING_BOOT_VER"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
+    implementation "org.springframework.boot:spring-boot-starter-web"
+    implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
 
-    testCompile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
-    testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
-    testCompile "org.springframework.boot:spring-boot-starter-security:$LIB_SPRING_BOOT_VER"
-    testCompile "org.jsoup:jsoup:1.12.1"
+    testImplementation "org.springframework.boot:spring-boot-starter-web"
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
+    testImplementation "org.springframework.boot:spring-boot-starter-security"
+    testImplementation "org.jsoup:jsoup:$LIB_JSOUP_VER"
 }
 
 compileJava.dependsOn(processResources)
diff --git a/playground-spring-boot-starter/build.gradle b/playground-spring-boot-starter/build.gradle
index f145377a..20f97325 100644
--- a/playground-spring-boot-starter/build.gradle
+++ b/playground-spring-boot-starter/build.gradle
@@ -17,5 +17,5 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies {
-    compile(project(':playground-spring-boot-autoconfigure'))
+    implementation(project(':playground-spring-boot-autoconfigure'))
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index d8acbec4..5501d977 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,6 +17,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+buildscript {
+    pluginManagement {
+        repositories {
+            gradlePluginPortal()
+        }
+    }
+}
+
 rootProject.name = PROJECT_NAME
 
 include ":altair-spring-boot-autoconfigure"
diff --git a/voyager-spring-boot-autoconfigure/build.gradle b/voyager-spring-boot-autoconfigure/build.gradle
index 5a10f34f..277f890b 100644
--- a/voyager-spring-boot-autoconfigure/build.gradle
+++ b/voyager-spring-boot-autoconfigure/build.gradle
@@ -17,17 +17,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies{
-    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:$LIB_SPRING_BOOT_VER"
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
     
-    compile "org.springframework.boot:spring-boot-autoconfigure:$LIB_SPRING_BOOT_VER"
-    compile "org.apache.commons:commons-text:1.1"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
+    implementation "org.apache.commons:commons-text:$LIB_APACHE_COMMONS_TEXT"
+    compileOnly "org.springframework.boot:spring-boot-starter-web"
+    compileOnly "org.springframework.boot:spring-boot-starter-webflux"
 
-    compileOnly "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
-    compileOnly "org.springframework.boot:spring-boot-starter-webflux:$LIB_SPRING_BOOT_VER"
-
-    testCompile "org.springframework.boot:spring-boot-starter-web:$LIB_SPRING_BOOT_VER"
-    testCompile "org.springframework.boot:spring-boot-starter-webflux:$LIB_SPRING_BOOT_VER"
-    testCompile "org.springframework.boot:spring-boot-starter-test:$LIB_SPRING_BOOT_VER"
+    testImplementation "org.springframework.boot:spring-boot-starter-web"
+    testImplementation "org.springframework.boot:spring-boot-starter-webflux"
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
 }
 
 compileJava.dependsOn(processResources)
diff --git a/voyager-spring-boot-starter/build.gradle b/voyager-spring-boot-starter/build.gradle
index e01123dd..fa1caf13 100644
--- a/voyager-spring-boot-starter/build.gradle
+++ b/voyager-spring-boot-starter/build.gradle
@@ -17,5 +17,5 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 dependencies {
-    compile(project(':voyager-spring-boot-autoconfigure'))
+    implementation(project(':voyager-spring-boot-autoconfigure'))
 }
\ No newline at end of file