From dd6b56b6278d2d018b8288af3758f82a6cbec610 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Mon, 3 May 2021 08:13:06 -0400 Subject: [PATCH 1/2] Renaming extended-scalars version property for consistency --- gradle.properties | 2 +- graphql-spring-boot-autoconfigure/build.gradle | 2 +- graphql-spring-boot-dependencies/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 539b8fb8..1ef0d9da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,7 +32,7 @@ SOURCE_COMPATIBILITY=1.8 TARGET_COMPATIBILITY=1.8 ### Dependencies LIB_GRAPHQL_JAVA_VER=16.2 -LIB_EXTENDED_SCALARS_VERSION=16.0.1 +LIB_EXTENDED_SCALARS_VER=16.0.1 LIB_SPRING_BOOT_VER=2.4.5 LIB_GRAPHQL_SERVLET_VER=11.1.0 LIB_GRAPHQL_JAVA_TOOLS_VER=11.0.1 diff --git a/graphql-spring-boot-autoconfigure/build.gradle b/graphql-spring-boot-autoconfigure/build.gradle index 04e59ca9..fb681c35 100644 --- a/graphql-spring-boot-autoconfigure/build.gradle +++ b/graphql-spring-boot-autoconfigure/build.gradle @@ -21,7 +21,7 @@ dependencies { api(project(":graphql-kickstart-spring-boot-starter-tools")) api(project(":graphql-kickstart-spring-support")) implementation "org.springframework.boot:spring-boot-autoconfigure" - api "com.graphql-java:graphql-java-extended-scalars:$LIB_EXTENDED_SCALARS_VERSION" + api "com.graphql-java:graphql-java-extended-scalars:$LIB_EXTENDED_SCALARS_VER" api "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER" api "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER" api "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER" diff --git a/graphql-spring-boot-dependencies/build.gradle b/graphql-spring-boot-dependencies/build.gradle index 8ba03b89..93d5462e 100644 --- a/graphql-spring-boot-dependencies/build.gradle +++ b/graphql-spring-boot-dependencies/build.gradle @@ -2,7 +2,7 @@ apply plugin: "java-platform" dependencies { constraints { - api "com.graphql-java:graphql-java-extended-scalars:$LIB_EXTENDED_SCALARS_VERSION" + api "com.graphql-java:graphql-java-extended-scalars:$LIB_EXTENDED_SCALARS_VER" api "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER" api "com.graphql-java-kickstart:graphql-java-servlet:$LIB_GRAPHQL_SERVLET_VER" api "com.graphql-java-kickstart:graphql-java-kickstart:$LIB_GRAPHQL_SERVLET_VER" From 7a862e5f6c0672598ce7d6584bf5e41c56b90593 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Mon, 3 May 2021 13:51:35 -0400 Subject: [PATCH 2/2] Extract gradle plugin versions to gradle.properties --- build.gradle | 8 ++++---- gradle.properties | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index cc9b5b53..526d30b9 100644 --- a/build.gradle +++ b/build.gradle @@ -22,10 +22,10 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { id "org.springframework.boot" version "$LIB_SPRING_BOOT_VER" apply false - id "org.sonarqube" version "3.2.0" + id "org.sonarqube" version "$PLUGIN_SONARQUBE_VER" id "jacoco" - id 'io.codearte.nexus-staging' version '0.30.0' - id 'com.github.sherter.google-java-format' version '0.9' apply false + id 'io.codearte.nexus-staging' version "$PLUGIN_NEXUS_STAGING_VER" + id 'com.github.sherter.google-java-format' version "$PLUGIN_GOOGLE_JAVA_FORMAT_VER" apply false } sonarqube { @@ -92,7 +92,7 @@ subprojects { } jacoco { - toolVersion = "0.8.7-SNAPSHOT" + toolVersion = "$PLUGIN_JACOCO_VER" } jacocoTestReport { diff --git a/gradle.properties b/gradle.properties index 1ef0d9da..afb3b439 100644 --- a/gradle.properties +++ b/gradle.properties @@ -40,5 +40,10 @@ LIB_GRAPHQL_ANNOTATIONS_VER=8.3 LIB_REFLECTIONS_VER=0.9.11 LIB_APACHE_COMMONS_TEXT=1.9 LIB_JSOUP_VER=1.13.1 +### Plugins +PLUGIN_JACOCO_VER=0.8.7-SNAPSHOT +PLUGIN_SONARQUBE_VER=3.2.0 +PLUGIN_NEXUS_STAGING_VER=0.30.0 +PLUGIN_GOOGLE_JAVA_FORMAT_VER=0.9 ### org.gradle.daemon=true