Upgrade to Gradle 7.0.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

graphql-spring-boot-starter/build.gradle

@@ -4,7 +4,6 @@ plugins {
 	id 'org.springframework.boot' version '2.4.5' apply false
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id 'java-library'
-	id 'maven'
 }
 
 description = "GraphQL Spring Boot Starter"

spring-graphql-test/build.gradle

@@ -2,7 +2,6 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id 'java-library'
-	id 'maven'
 }
 
 description = "Spring Support for Testing GraphQL Applications"
@@ -49,8 +48,8 @@ dependencies {
 	testImplementation 'com.squareup.okhttp3:mockwebserver:3.14.9'
 	testImplementation 'com.fasterxml.jackson.core:jackson-databind'
 
-	testRuntime 'org.apache.logging.log4j:log4j-core:2.14.1'
-	testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1'
+	testRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.14.1'
+	testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1'
 }
 
 test {

spring-graphql/build.gradle

@@ -2,7 +2,6 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id 'java-library'
-	id 'maven'
 }
 
 description = "GraphQL Support for Spring Applications"
@@ -44,8 +43,8 @@ dependencies {
 	testImplementation 'javax.servlet:javax.servlet-api:4.0.1'
 	testImplementation 'com.fasterxml.jackson.core:jackson-databind'
 
-	testRuntime 'org.apache.logging.log4j:log4j-core:2.14.1'
-	testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1'
+	testRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.14.1'
+	testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1'
 }
 
 test {