Merge branch 'gradle-7' into lombok-annotation-processor

# Conflicts:
#	graphql-java-kickstart/build.gradle

Author: oliemansm

build.gradle

@@ -184,5 +184,5 @@ nexusStaging {
 }
 
 wrapper {
-    gradleVersion = "${GRADLE_WRAPPER_VER}"
+    distributionType = Wrapper.DistributionType.ALL
 }

gradle.properties

@@ -13,4 +13,4 @@ LIB_SLF4J_VER=1.7.30
 LIB_LOMBOK_VER=1.18.20
 SOURCE_COMPATIBILITY=1.8
 TARGET_COMPATIBILITY=1.8
-GRADLE_WRAPPER_VER=6.7.1
+GRADLE_WRAPPER_VER=7.0

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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

graphql-java-kickstart/build.gradle

@@ -4,14 +4,16 @@ jar {
     bndfile = 'bnd.bnd'
 }
 
+apply plugin: 'java-library-distribution'
+
 dependencies {
     // GraphQL
-    apiElements "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
+    api "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER"
     implementation "org.slf4j:slf4j-api:$LIB_SLF4J_VER"
 
     // JSON
-    apiElements "com.fasterxml.jackson.core:jackson-core:$LIB_JACKSON_VER"
-    apiElements "com.fasterxml.jackson.core:jackson-annotations:$LIB_JACKSON_VER"
-    apiElements "com.fasterxml.jackson.core:jackson-databind:$LIB_JACKSON_VER"
-    apiElements "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$LIB_JACKSON_VER"
+    api "com.fasterxml.jackson.core:jackson-core:$LIB_JACKSON_VER"
+    api "com.fasterxml.jackson.core:jackson-annotations:$LIB_JACKSON_VER"
+    api "com.fasterxml.jackson.core:jackson-databind:$LIB_JACKSON_VER"
+    api "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$LIB_JACKSON_VER"
 }

graphql-java-servlet/build.gradle

@@ -29,15 +29,15 @@ dependencies {
     compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0'
     compileOnly 'org.osgi:org.osgi.annotation:6.0.0'
 
-    testCompile 'io.github.graphql-java:graphql-java-annotations:8.3'
+    testImplementation 'io.github.graphql-java:graphql-java-annotations:8.3'
 
     // Unit testing
-    testCompile "org.codehaus.groovy:groovy-all:2.4.1"
-    testCompile "org.spockframework:spock-core:1.1-groovy-2.4-rc-3"
-    testRuntime "cglib:cglib-nodep:3.2.4"
-    testRuntime "org.objenesis:objenesis:2.5.1"
-    testCompile "org.slf4j:slf4j-simple:$LIB_SLF4J_VER"
-    testCompile 'org.springframework:spring-test:4.3.7.RELEASE'
-    testRuntime 'org.springframework:spring-web:4.3.7.RELEASE'
-    testCompile 'com.google.guava:guava:24.1.1-jre'
+    testImplementation "org.codehaus.groovy:groovy-all:2.4.1"
+    testImplementation "org.spockframework:spock-core:1.1-groovy-2.4-rc-3"
+    testRuntimeOnly "cglib:cglib-nodep:3.2.4"
+    testRuntimeOnly "org.objenesis:objenesis:2.5.1"
+    testImplementation "org.slf4j:slf4j-simple:$LIB_SLF4J_VER"
+    testImplementation 'org.springframework:spring-test:4.3.7.RELEASE'
+    testRuntimeOnly 'org.springframework:spring-web:4.3.7.RELEASE'
+    testImplementation 'com.google.guava:guava:24.1.1-jre'
 }