Skip to content

Commit

Permalink
Merge pull request #1270 from Netflix/feature/graphql-java-19
Browse files Browse the repository at this point in the history
Upgrade to graphql-java 19.0 & Federation 2.1.0
  • Loading branch information
berngp committed Oct 13, 2022
2 parents 54b36b3 + c934962 commit 330bcc2
Show file tree
Hide file tree
Showing 98 changed files with 4,201 additions and 4,190 deletions.
10 changes: 5 additions & 5 deletions build.gradle.kts
Expand Up @@ -28,7 +28,7 @@ plugins {
`java-library`
id("nebula.dependency-recommender") version "11.0.0"
id("nebula.netflixoss") version "10.6.0"
id("org.jmailen.kotlinter") version "3.10.0"
id("org.jmailen.kotlinter") version "3.11.1"
id("me.champeau.jmh") version "0.6.6"
kotlin("jvm") version Versions.KOTLIN_VERSION
kotlin("kapt") version Versions.KOTLIN_VERSION
Expand All @@ -50,16 +50,16 @@ allprojects {
// and suggest an upgrade. The only exception currently are those defined
// in buildSrc, most likley because the variables are used in plugins as well
// as dependencies. e.g. KOTLIN_VERSION
extra["sb.version"] = "2.6.7"
extra["sb.version"] = "2.6.12"
val springBootVersion = extra["sb.version"] as String

dependencyRecommendations {
mavenBom(mapOf("module" to "org.jetbrains.kotlin:kotlin-bom:${Versions.KOTLIN_VERSION}"))
mavenBom(mapOf("module" to "org.springframework:spring-framework-bom:5.3.18"))
mavenBom(mapOf("module" to "org.springframework:spring-framework-bom:5.3.23"))
mavenBom(mapOf("module" to "org.springframework.boot:spring-boot-dependencies:${springBootVersion}"))
mavenBom(mapOf("module" to "org.springframework.security:spring-security-bom:5.6.5"))
mavenBom(mapOf("module" to "org.springframework.security:spring-security-bom:5.7.3"))
mavenBom(mapOf("module" to "org.springframework.cloud:spring-cloud-dependencies:2021.0.2"))
mavenBom(mapOf("module" to "com.fasterxml.jackson:jackson-bom:2.13.2"))
mavenBom(mapOf("module" to "com.fasterxml.jackson:jackson-bom:2.13.4"))
}
}

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Versions.kt
Expand Up @@ -15,5 +15,5 @@
*/

object Versions {
const val KOTLIN_VERSION = "1.6.21"
const val KOTLIN_VERSION = "1.7.20"
}

0 comments on commit 330bcc2

Please sign in to comment.