From 1ed21a1209e2a45f38133e616b88269f6e0d7b8a Mon Sep 17 00:00:00 2001 From: Bernardo Gomez Palacio Date: Mon, 29 Nov 2021 14:06:46 -0800 Subject: [PATCH] Moving GRAPHQL Version to the Platform BOM Relocate the GraphQL Version definitions to the Platform BOM to avoid an unnecessary level of indirection. --- buildSrc/src/main/kotlin/Versions.kt | 7 ------- graphql-dgs-platform/build.gradle.kts | 11 +++++++---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index d92353285..9fa2c988e 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -20,12 +20,5 @@ object Versions { const val SPRING_BOOT_VERSION = "2.3.9.RELEASE" const val SPRING_SECURITY_VERSION = "5.3.9.RELEASE" const val SPRING_CLOUD_VERSION = "Hoxton.SR10" - const val GRAPHQL_JAVA = "17.3" - const val GRAPHQL_JAVA_EXTENDED_SCALARS = "17.0" - - // The version below will work with Jakarta EE 8 - // and use Hibernate Validator 6.2. - const val GRAPHQL_JAVA_EXTENDED_VALIDATION = "17.0-hibernate-validator-6.2.0.Final" - const val GRAPHQL_JAVA_FEDERATION = "0.7.0" const val JACKSON_BOM = "2.12.3" } diff --git a/graphql-dgs-platform/build.gradle.kts b/graphql-dgs-platform/build.gradle.kts index 677f49b34..932f47db7 100644 --- a/graphql-dgs-platform/build.gradle.kts +++ b/graphql-dgs-platform/build.gradle.kts @@ -45,18 +45,21 @@ dependencies { // this will be published as Maven Metadata. // For more information at https://docs.gradle.org/current/userguide/rich_versions.html constraints { + // GraphQL Platform api("com.graphql-java:graphql-java") { - version { require(Versions.GRAPHQL_JAVA) } + version { require("17.3") } } api("com.graphql-java:graphql-java-extended-scalars") { - version { require(Versions.GRAPHQL_JAVA_EXTENDED_SCALARS) } + version { require("17.0") } } api("com.graphql-java:graphql-java-extended-validation") { - version { require(Versions.GRAPHQL_JAVA_EXTENDED_VALIDATION) } + // The version below will work with Jakarta EE 8 and use Hibernate Validator 6.2. + version { require("17.0-hibernate-validator-6.2.0.Final") } } api("com.apollographql.federation:federation-graphql-java-support") { - version { require(Versions.GRAPHQL_JAVA_FEDERATION) } + version { require("0.7.0") } } + // --- api("com.jayway.jsonpath:json-path") { version { require("2.6.0") } }