From c6778cfc7ce914a9539a79cd327fe7d168d98b92 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 18 May 2020 20:34:45 -0700 Subject: [PATCH] Disable Groovy version override. Comment out 'groovyVersion' property set to 2.4.19. --- build.gradle | 2 +- gradle.properties | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 13d379d..158b671 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ apply plugin: 'io.spring.convention.root' group = 'org.springframework.session' description = 'Spring Session for Apache Geode' -ext['groovy.version'] = "$groovyVersion" +//ext['groovy.version'] = "$groovyVersion" ext['spring.version'] = "$springVersion" ext['spring-framework.version'] = "$springVersion" ext['spring-data-releasetrain.version'] = "$springDataReleaseTrainVersion" diff --git a/gradle.properties b/gradle.properties index a721089..49e0aa8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,9 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 antlrVersion=2.7.7 apacheGeodeVersion=1.12.0 apacheTaglibsStandardVersion=1.2.5 -groovyVersion=2.4.19 +# Spring Boot 2.3 sets Apache Groovy version to 2.5.11 +# https://github.com/spring-projects/spring-boot/blob/v2.3.0.RELEASE/spring-boot-project/spring-boot-dependencies/build.gradle#L365 +#groovyVersion=2.4.19 javaxServletJspJstlApiVersion=1.2.1 multithreadedtcVersion=1.01 pivotalGemFireVersion=9.10.0