Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle

Author: oliemansm

.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

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)

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'))
 }

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
@@ -70,79 +74,59 @@ 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
 }

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

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

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
+publishToMavenLocal.enabled = false

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