From ec12f50330b5cc17b03d2f9ee49a72e5efd04326 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 30 Mar 2022 06:27:23 +0000 Subject: [PATCH 1/3] chore(deps): update dependency org.spockframework:spock-core to v2.1-groovy-3.0 --- graphql-java-servlet/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphql-java-servlet/build.gradle b/graphql-java-servlet/build.gradle index ea5cdd43..ab9fcd38 100644 --- a/graphql-java-servlet/build.gradle +++ b/graphql-java-servlet/build.gradle @@ -32,7 +32,7 @@ dependencies { // Unit testing testImplementation "org.codehaus.groovy:groovy-all:3.0.10" - testImplementation "org.spockframework:spock-core:2.0-groovy-3.0" + testImplementation "org.spockframework:spock-core:2.1-groovy-3.0" testRuntimeOnly "cglib:cglib-nodep:3.3.0" testRuntimeOnly "org.objenesis:objenesis:3.2" testImplementation "org.slf4j:slf4j-simple:$LIB_SLF4J_VER" From a450d43f14399079897525cd90e07673fe293a42 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 30 Mar 2022 06:38:29 +0000 Subject: [PATCH 2/3] chore(deps): update dependency org.spockframework:spock-core to v2.1-groovy-3.0 --- graphql-java-servlet/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphql-java-servlet/build.gradle b/graphql-java-servlet/build.gradle index ea5cdd43..ab9fcd38 100644 --- a/graphql-java-servlet/build.gradle +++ b/graphql-java-servlet/build.gradle @@ -32,7 +32,7 @@ dependencies { // Unit testing testImplementation "org.codehaus.groovy:groovy-all:3.0.10" - testImplementation "org.spockframework:spock-core:2.0-groovy-3.0" + testImplementation "org.spockframework:spock-core:2.1-groovy-3.0" testRuntimeOnly "cglib:cglib-nodep:3.3.0" testRuntimeOnly "org.objenesis:objenesis:3.2" testImplementation "org.slf4j:slf4j-simple:$LIB_SLF4J_VER" From d7cdd53a7bf0a76890561a69eb9cbf8a15a332a3 Mon Sep 17 00:00:00 2001 From: oliemansm Date: Wed, 30 Mar 2022 08:42:26 +0200 Subject: [PATCH 3/3] fix: replace jetbrains not null with lombok --- gradle.properties | 9 ++++----- .../groovy/graphql/kickstart/servlet/TestUtils.groovy | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 59b682dd..c1c0ea83 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,14 @@ version=13.0.0-SNAPSHOT group=com.graphql-java-kickstart PROJECT_NAME=graphql-java-servlet PROJECT_DESC=GraphQL Java Kickstart -PROJECT_GIT_REPO_URL=https://github.com/graphql-java-kickstart/graphql-spring-boot +PROJECT_GIT_REPO_URL=https://github.com/graphql-java-kickstart/graphql-java-servlet PROJECT_LICENSE=MIT -PROJECT_LICENSE_URL=https://github.com/graphql-java-kickstart/spring-boot-graphql/blob/master/LICENSE.md -PROJECT_DEV_ID=apottere -PROJECT_DEV_NAME=Andrew Potter +PROJECT_LICENSE_URL=https://github.com/graphql-java-kickstart/spring-java-servlet/blob/master/LICENSE.md +PROJECT_DEV_ID=oliemansm +PROJECT_DEV_NAME=Michiel Oliemans LIB_GRAPHQL_JAVA_VER=17.3 LIB_JACKSON_VER=2.13.2 LIB_SLF4J_VER=1.7.36 LIB_LOMBOK_VER=1.18.22 SOURCE_COMPATIBILITY=1.8 TARGET_COMPATIBILITY=1.8 -GRADLE_WRAPPER_VER=7.0 diff --git a/graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/TestUtils.groovy b/graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/TestUtils.groovy index 9711db57..797f5048 100644 --- a/graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/TestUtils.groovy +++ b/graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/TestUtils.groovy @@ -14,7 +14,7 @@ import graphql.schema.idl.SchemaGenerator import graphql.schema.idl.SchemaParser import graphql.schema.idl.TypeRuntimeWiring import graphql.schema.idl.errors.SchemaProblem -import org.jetbrains.annotations.NotNull +import lombok.NonNull import java.util.concurrent.Executor import java.util.concurrent.atomic.AtomicReference @@ -105,7 +105,7 @@ class TestUtils { private static Executor executor() { new Executor() { @Override - void execute(@NotNull Runnable command) { + void execute(@NonNull Runnable command) { command.run() } }