update to SpringBoot 3 and Java 17

SpringBoot v3 requires Java 17. This PR updates target bytecode of ALL `graphql-kotlin` modules to Java 17 and as a result ibrary users will have to use Java 17+ as well.

Author: dariuszkuc

.github/workflows/build-examples.yml

@@ -17,10 +17,10 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
 
-      - name: Set up Java 11
+      - name: Set up Java 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
 
       - name: Set up Gradle cache

.github/workflows/build-libraries.yml

@@ -14,10 +14,10 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
 
-      - name: Set up Java 11
+      - name: Set up Java 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
 
       - name: Set up Gradle cache

.github/workflows/federation-compatibility.yml

@@ -20,10 +20,10 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
 
-      - name: Set up Java 11
+      - name: Set up Java 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
 
       - name: Set up Gradle cache

.github/workflows/federation-composition.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up Java 11
+      - name: Set up Java 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
 
       - name: Set up Gradle cache

.github/workflows/release-code.yml

@@ -15,10 +15,10 @@ jobs:
 
       - uses: gradle/wrapper-validation-action@v1
 
-      - name: Set up Java 11
+      - name: Set up Java 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
 
       - name: Build library with Gradle

buildSrc/src/main/kotlin/com.expediagroup.graphql.conventions.gradle.kts

@@ -19,10 +19,11 @@ plugins {
 // see https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
 val libs = the<LibrariesForLibs>()
 tasks {
-    val kotlinJvmVersion: String by project
+    kotlin {
+        jvmToolchain(17)
+    }
     withType<KotlinCompile> {
         kotlinOptions {
-            jvmTarget = kotlinJvmVersion
             freeCompilerArgs = listOf("-Xjsr305=strict")
         }
     }
@@ -53,12 +54,6 @@ tasks {
         // NOTE: in order to run gradle and maven plugin integration tests we need to have our build artifacts available in local repo
         finalizedBy("publishToMavenLocal")
     }
-    java {
-        // even though we don't have any Java code, since we are building using Java LTS version,
-        // this is required for Gradle to set the correct JVM versions in the module metadata
-        targetCompatibility = JavaVersion.VERSION_1_8
-        sourceCompatibility = JavaVersion.VERSION_1_8
-    }
 
     // published sources and javadoc artifacts
     val jarComponent = project.components.getByName("java")

gradle.properties

@@ -13,4 +13,4 @@ systemProp.org.gradle.internal.publish.checksums.insecure=true
 # See: https://github.com/gradle/gradle/issues/8139
 org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError
 
-kotlinJvmVersion = 1.8
+kotlinJvmVersion = 17

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ classgraph = "4.8.149"
 dataloader = "3.2.0"
 federation = "2.2.0"
 graphql-java = "19.2"
-jackson = "2.13.3"
+jackson = "2.14.1"
 kotlin = "1.7.21"
 kotlinx-benchmark = "0.4.4"
 kotlinx-coroutines = "1.6.4"
@@ -15,20 +15,20 @@ maven-plugin-api = "3.6.3"
 maven-project = "2.2.1"
 poet = "1.12.0"
 ## reactorVersion should be the same reactor-core version pulled from spring-boot-starter-webflux
-reactor-core = "3.4.26"
-reactor-extensions = "1.1.9"
+reactor-core = "3.5.1"
+reactor-extensions = "1.2.1"
 slf4j = "1.7.36"
-spring = "5.3.24"
-spring-boot = "2.7.7"
+spring = "6.0.3"
+spring-boot = "3.0.1"
 
 # test dependencies
 # kotlin-compile-testing has to be using the same kotlin version as the kotlinx-serialization compiler
 # https://github.com/tschuchortdev/kotlin-compile-testing the latest version targets kotlin 1.7.10 which blocks updates to newer
 # versions of kotlin, switching to a fork https://github.com/ZacSweers/kotlin-compile-testing
 compile-testing = "0.1.0"
 icu = "71.1"
-junit = "5.8.2"
-mockk = "1.12.5"
+junit = "5.9.1"
+mockk = "1.13.3"
 mustache = "0.9.10"
 rxjava = "3.1.5"
 wiremock = "2.33.2"
@@ -40,7 +40,7 @@ jacoco = "0.8.8"
 # klint gradle plugin breaks with 0.46.x+
 ktlint-core = "0.45.2"
 ktlint-plugin = "10.3.0"
-maven-plugin-development = "0.4.0"
+maven-plugin-development = "0.4.1"
 nexus-publish-plugin = "1.1.0"
 plugin-publish = "0.21.0"
 

integration/federation-compatibility/build.gradle.kts

@@ -21,7 +21,6 @@ plugins {
 }
 
 group = "com.expediagroup.federation.compatibility"
-java.sourceCompatibility = JavaVersion.VERSION_11
 
 repositories {
     mavenCentral()
@@ -39,15 +38,18 @@ dependencies {
     graphqlSDL("com.expediagroup", "graphql-kotlin-federated-hooks-provider")
 }
 
-tasks.withType<KotlinCompile> {
-	kotlinOptions {
-		freeCompilerArgs = listOf("-Xjsr305=strict")
-		jvmTarget = "11"
-	}
-}
-
-tasks.withType<Test> {
-	useJUnitPlatform()
+tasks {
+    kotlin {
+        jvmToolchain(17)
+    }
+    withType<KotlinCompile> {
+        kotlinOptions {
+            freeCompilerArgs = listOf("-Xjsr305=strict")
+        }
+    }
+    withType<Test> {
+        useJUnitPlatform()
+    }
 }
 
 graphql {

plugins/graphql-kotlin-maven-plugin/build.gradle.kts

@@ -4,17 +4,29 @@ import java.time.Duration
 description = "GraphQL Kotlin Maven Plugin that can generate type-safe GraphQL Kotlin client and GraphQL schema in SDL format using reflections"
 
 buildscript {
+    repositories {
+        mavenCentral()
+        mavenLocal {
+            content {
+                includeGroup("de.benediktritter")
+            }
+        }
+    }
+
     dependencies {
         classpath(libs.wiremock.standalone)
+        classpath("de.benediktritter:plugin:99.99.99")
     }
 }
 
 @Suppress("DSL_SCOPE_VIOLATION") // TODO: remove once KTIJ-19369 / Gradle#22797 is fixed
 plugins {
     id("com.expediagroup.graphql.conventions")
-    alias(libs.plugins.maven.plugin.development)
+//    alias(libs.plugins.maven.plugin.development)
 }
 
+apply(plugin = "de.benediktritter.maven-plugin-development")
+
 dependencies {
     api(projects.graphqlKotlinClientGenerator)
     api(projects.graphqlKotlinSdlGenerator)

servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/GraphQLConfigurationProperties.kt

@@ -17,12 +17,10 @@
 package com.expediagroup.graphql.server.spring
 
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.context.properties.ConstructorBinding
 
 /**
  * [ConfigurationProperties] bean that defines supported GraphQL configuration options.
  */
-@ConstructorBinding
 @ConfigurationProperties("graphql")
 data class GraphQLConfigurationProperties(
     /** GraphQL server endpoint, defaults to 'graphql' */

servers/graphql-kotlin-spring-server/src/main/kotlin/com/expediagroup/graphql/server/spring/execution/SpringGraphQLRequestParser.kt

@@ -42,7 +42,7 @@ open class SpringGraphQLRequestParser(
 
     override suspend fun parseRequest(request: ServerRequest): GraphQLServerRequest? = when {
         request.queryParam(REQUEST_PARAM_QUERY).isPresent -> { getRequestFromGet(request) }
-        request.method() == HttpMethod.POST -> { getRequestFromPost(request) }
+        request.method().equals(HttpMethod.POST) -> { getRequestFromPost(request) }
         else -> null
     }
 

servers/graphql-kotlin-spring-server/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
+com.expediagroup.graphql.server.spring.GraphQLAutoConfiguration

servers/graphql-kotlin-spring-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.web.server.LocalServerPort
+import org.springframework.boot.test.web.server.LocalServerPort
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.MediaType

servers/graphql-kotlin-spring-server/src/test/kotlin/com/expediagroup/graphql/server/spring/routes/SubscriptionRoutesConfigurationIT.kt

@@ -29,7 +29,7 @@ import graphql.schema.DataFetchingEnvironment
 import org.junit.jupiter.api.Test
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.web.server.LocalServerPort
+import org.springframework.boot.test.web.server.LocalServerPort
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpHeaders