From 8908573b80f61705411824b573340f23256daae0 Mon Sep 17 00:00:00 2001 From: samvazquez Date: Thu, 9 Jun 2022 10:58:47 -0700 Subject: [PATCH 1/4] feat: update spring-boot version to 5.3.20 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6219eb8cfb..d9c6446823 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,7 +30,7 @@ reactorVersion = 3.4.9 reactorExtensionsVersion = 1.1.3 slf4jVersion = 1.7.32 springBootVersion = 2.5.5 -springVersion = 5.3.10 +springVersion = 5.3.20 # test dependency versions compileTestingVersion = 1.4.3 From 37f6eeb6a0a2ca369d700c523bc3bebd377d26db Mon Sep 17 00:00:00 2001 From: samvazquez Date: Thu, 9 Jun 2022 11:41:58 -0700 Subject: [PATCH 2/4] feat: strictly use graphql-java 17.2 --- generator/graphql-kotlin-schema-generator/build.gradle.kts | 6 +++++- gradle.properties | 2 +- .../client/graphql-kotlin-client-generator/build.gradle.kts | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/generator/graphql-kotlin-schema-generator/build.gradle.kts b/generator/graphql-kotlin-schema-generator/build.gradle.kts index 359ac2fd6c..037a12eca9 100644 --- a/generator/graphql-kotlin-schema-generator/build.gradle.kts +++ b/generator/graphql-kotlin-schema-generator/build.gradle.kts @@ -9,7 +9,11 @@ val junitVersion: String by project val slf4jVersion: String by project dependencies { - api("com.graphql-java:graphql-java:$graphQLJavaVersion") + api("com.graphql-java:graphql-java") { + version { + strictly(graphQLJavaVersion) + } + } api("org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$kotlinCoroutinesVersion") api("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion") implementation("io.github.classgraph:classgraph:$classGraphVersion") diff --git a/gradle.properties b/gradle.properties index d9c6446823..c8e9f1b757 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,7 +29,7 @@ ktorVersion = 1.6.3 reactorVersion = 3.4.9 reactorExtensionsVersion = 1.1.3 slf4jVersion = 1.7.32 -springBootVersion = 2.5.5 +springBootVersion = 2.6.8 springVersion = 5.3.20 # test dependency versions diff --git a/plugins/client/graphql-kotlin-client-generator/build.gradle.kts b/plugins/client/graphql-kotlin-client-generator/build.gradle.kts index 129a2cc38c..7b5fa3e4b8 100644 --- a/plugins/client/graphql-kotlin-client-generator/build.gradle.kts +++ b/plugins/client/graphql-kotlin-client-generator/build.gradle.kts @@ -12,7 +12,10 @@ val wireMockVersion: String by project dependencies { api(project(path = ":graphql-kotlin-client")) - api("com.graphql-java:graphql-java:$graphQLJavaVersion") { + api("com.graphql-java:graphql-java") { + version { + strictly(graphQLJavaVersion) + } exclude(group = "com.graphql-java", module = "java-dataloader") } api("com.squareup:kotlinpoet:$kotlinPoetVersion") From ca7c306d19e269939b60f742b11ca3da554d0cb1 Mon Sep 17 00:00:00 2001 From: samvazquez Date: Thu, 9 Jun 2022 12:10:14 -0700 Subject: [PATCH 3/4] feat: update reactor version --- gradle.properties | 4 ++-- .../client/graphql-kotlin-client-generator/build.gradle.kts | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index c8e9f1b757..065f28eff3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,8 +26,8 @@ graphQLJavaVersion = 17.2 jacksonVersion = 2.12.5 kotlinPoetVersion = 1.10.1 ktorVersion = 1.6.3 -reactorVersion = 3.4.9 -reactorExtensionsVersion = 1.1.3 +reactorVersion = 3.4.16 +reactorExtensionsVersion = 1.1.6 slf4jVersion = 1.7.32 springBootVersion = 2.6.8 springVersion = 5.3.20 diff --git a/plugins/client/graphql-kotlin-client-generator/build.gradle.kts b/plugins/client/graphql-kotlin-client-generator/build.gradle.kts index 7b5fa3e4b8..129a2cc38c 100644 --- a/plugins/client/graphql-kotlin-client-generator/build.gradle.kts +++ b/plugins/client/graphql-kotlin-client-generator/build.gradle.kts @@ -12,10 +12,7 @@ val wireMockVersion: String by project dependencies { api(project(path = ":graphql-kotlin-client")) - api("com.graphql-java:graphql-java") { - version { - strictly(graphQLJavaVersion) - } + api("com.graphql-java:graphql-java:$graphQLJavaVersion") { exclude(group = "com.graphql-java", module = "java-dataloader") } api("com.squareup:kotlinpoet:$kotlinPoetVersion") From e91d664abf26970058e3eff21316514d8c6991ea Mon Sep 17 00:00:00 2001 From: samvazquez Date: Thu, 9 Jun 2022 12:29:41 -0700 Subject: [PATCH 4/4] feat: update reactor version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 065f28eff3..78808c903f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ graphQLJavaVersion = 17.2 jacksonVersion = 2.12.5 kotlinPoetVersion = 1.10.1 ktorVersion = 1.6.3 -reactorVersion = 3.4.16 +reactorVersion = 3.4.18 reactorExtensionsVersion = 1.1.6 slf4jVersion = 1.7.32 springBootVersion = 2.6.8