Merge branch 'main' into preparsed-document-provider

# Conflicts:
#	spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQlSourceBuilder.java

Author: jord1e

README.md

@@ -1,4 +1,4 @@
-# Spring GraphQL [![Build status](https://ci.spring.io/api/v1/teams/spring-graphql/pipelines/spring-graphql/jobs/build/badge)](https://ci.spring.io/teams/spring-graphql/pipelines/spring-graphql)
+# Spring for GraphQL [![Build status](https://ci.spring.io/api/v1/teams/spring-graphql/pipelines/spring-graphql/jobs/build/badge)](https://ci.spring.io/teams/spring-graphql/pipelines/spring-graphql)
 
 [GraphQL](https://graphql.org/) support for Spring applications with [GraphQL Java](https://github.com/graphql-java/graphql-java).
 
@@ -13,7 +13,7 @@ This project has reference documentation ([published](https://docs.spring.io/spr
 
 ## Continuous Integration Builds
 
-Information regarding CI builds can be found in the [Spring GraphQL Concourse pipeline](ci/README.adoc) documentation.
+Information regarding CI builds can be found in the project's [Concourse pipeline](ci/README.adoc) documentation.
 
 ## Stay in Touch
 

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-	id 'org.jetbrains.kotlin.jvm' version '1.6.0' apply false
+	id 'org.jetbrains.kotlin.jvm' version '1.5.32' apply false
 }
 
 ext {
@@ -9,7 +9,7 @@ ext {
 	bootVersion = "2.7.0-SNAPSHOT"
 }
 
-description = "Spring GraphQL"
+description = "Spring for GraphQL"
 
 subprojects {
 	apply plugin: 'io.spring.dependency-management'
@@ -63,7 +63,7 @@ configure(moduleProjects) {
 			mavenBom "org.springframework.data:spring-data-bom:2021.1.0"
 			mavenBom "org.springframework.security:spring-security-bom:5.6.0"
 			mavenBom "com.querydsl:querydsl-bom:5.0.0"
-			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.6.0"
+			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.32"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
 			mavenBom "org.junit:junit-bom:5.8.1"
 			mavenBom "org.testcontainers:testcontainers-bom:1.16.2"
@@ -103,5 +103,11 @@ configure(moduleProjects) {
 		}
 	}
 
+	ext.javadocLinks = [
+			"https://docs.oracle.com/javase/8/docs/api/",
+			"https://docs.spring.io/spring-framework/docs/5.3.x/javadoc-api/",
+			"https://javadoc.io/doc/com.graphql-java/graphql-java/17.3/"
+	] as String[]
+
 	apply from: "${rootDir}/gradle/publishing.gradle"
 }

ci/README.adoc

@@ -1,11 +1,11 @@
-== Spring GraphQL Concourse pipeline
+== Spring for GraphQL Concourse pipeline
 
-The Spring GraphQL project is using https://concourse-ci.org/[Concourse] for its CI build and other automated tasks.
+The Spring for GraphQL project is using https://concourse-ci.org/[Concourse] for its CI build and other automated tasks.
 The Spring team has a dedicated Concourse instance available at https://ci.spring.io.
 
 === Setting up your development environment
 
-If you're part of the Spring GraphQL team on GitHub, you can get access to CI management features.
+If you're part of the Spring for GraphQL team on GitHub, you can get access to CI management features.
 First, you need to go to https://ci.spring.io and install the client CLI for your platform (see bottom right of the screen).
 
 You can then login with the instance using:

ci/images/ci-image/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20211006
+FROM ubuntu:focal-20220105
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh

ci/pipeline.yml

@@ -102,7 +102,7 @@ jobs:
             - "/**/spring-graphql-docs-*.zip"
           properties:
             "zip.name": "spring-graphql"
-            "zip.displayname": "Spring GraphQL"
+            "zip.displayname": "Spring for GraphQL"
             "zip.deployed": "false"
             "zip.type": "docs"
     get_params:
@@ -144,11 +144,48 @@ jobs:
       params:
         RELEASE_TYPE: M
         <<: *artifactory-task-params
+- name: stage-rc
+  serial: true
+  plan:
+    - get: ci-image
+    - get: git-repo
+      trigger: false
+    - task: stage
+      image: ci-image
+      file: git-repo/ci/tasks/stage-version.yml
+      params:
+        RELEASE_TYPE: RC
+        <<: *gradle-enterprise-task-params
+    - put: artifactory-repo
+      params:
+        <<: *artifactory-params
+        repo: libs-staging-local
+    - put: git-repo
+      params:
+        repository: stage-git-repo
+- name: promote-rc
+  serial: true
+  plan:
+    - get: ci-image
+    - get: git-repo
+      trigger: false
+    - get: artifactory-repo
+      trigger: false
+      passed: [stage-rc]
+      params:
+        download_artifacts: false
+        save_build_info: true
+    - task: promote
+      image: ci-image
+      file: git-repo/ci/tasks/promote-version.yml
+      params:
+        RELEASE_TYPE: rc
+        <<: *artifactory-task-params
 
 groups:
 - name: "builds"
   jobs: ["build"]
 - name: "releases"
-  jobs: [ "stage-milestone", "promote-milestone" ]
+  jobs: [ "stage-milestone", "promote-milestone", "stage-rc", "promote-rc" ]
 - name: "ci-images"
   jobs: ["build-ci-images"]

gradle.properties

@@ -4,3 +4,5 @@ org.gradle.caching=true
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8
+
+kotlin.stdlib.default.dependency=false

gradle/publishing.gradle

@@ -4,12 +4,15 @@ plugins.withType(JavaPlugin) {
 	javadoc {
 		description = "Generates project-level javadoc for use in -javadoc jar"
 
-		options.encoding = "UTF-8"
-		options.memberLevel = JavadocMemberLevel.PROTECTED
-		options.author = true
-		options.header = project.name
-		options.use = true
-		options.addStringOption("Xdoclint:none", "-quiet")
+		options {
+			encoding = "UTF-8"
+			memberLevel = JavadocMemberLevel.PROTECTED
+			author = true
+			header = project.name
+			use = true
+			links = project.ext.javadocLinks
+			addStringOption("Xdoclint:none", "-quiet")
+		}
 
 		// Suppress warnings due to cross-module @see and @link references.
 		// Note that global 'api' task does display all warnings.