From 8cca4035c4290e7d701cd1f1a7f6adaec0ae5043 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 21 Sep 2022 17:11:41 -0700 Subject: [PATCH] Fix compilation failures in the IDE. * Remove double quotes from the logbackVersion property. * Set (correct) core Spring Framework version to 5.2.23. * Change 'javax.enterprise:cdi-api:1.0' to a 'provided' dependency required to compile the CDI supporting infrastructure and source code. * Change 'ch.qos.logback:logback-classic' to a 'testImplementation' dependency required to compile test source code. Resolves #623. --- gradle.properties | 4 ++-- gradle/dependency-management.gradle | 1 + spring-data-geode/spring-data-geode.gradle | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index d064a7cf..5be69d7f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,9 +6,9 @@ apacheShiroVersion=1.9.1 aspectjVersion=1.9.9.1 cacheApiVersion=1.1.1 jacksonVersion=2.13.4 -logbackVersion="1.2.11" +logbackVersion=1.2.11 snappyVersion=0.4 -springVersion=6.0.0-M6 +springVersion=5.3.23 springDataBomVersion=2021.2.4-SNAPSHOT #springDataBuildParentVersion=2.7.4-SNAPSHOT springDataCommonsVersion=2.7.4-SNAPSHOT diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 984f9f2d..76a7ee2f 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -37,6 +37,7 @@ dependencyManagement { } dependencies { + dependency "javax.cache:cache-api:$cacheApiVersion" dependency "antlr:antlr:$antlrVersion" dependency "ch.qos.logback:logback-classic:$logbackVersion" dependency "com.google.code.findbugs:jsr305:$findbugsVersion" diff --git a/spring-data-geode/spring-data-geode.gradle b/spring-data-geode/spring-data-geode.gradle index 10edc4ba..9752491c 100644 --- a/spring-data-geode/spring-data-geode.gradle +++ b/spring-data-geode/spring-data-geode.gradle @@ -16,7 +16,7 @@ dependencies { } api "org.apache.geode:geode-cq" - api "org.apache.geode:geode-lucence" + api "org.apache.geode:geode-lucene" api "org.apache.geode:geode-wan" provided "org.apache.geode:geode-gfsh" @@ -45,7 +45,7 @@ dependencies { testImplementation "org.apache.geronimo.specs:geronimo-jcdi_2.0_spec:1.0.1" testImplementation "javax.interceptor:javax.interceptor-api:1.2.1" testImplementation "javax.el:el-api:2.2" - testImplementation "javax.enterprise:cdi-api:1.0" + provided "javax.enterprise:cdi-api:1.0" testImplementation "javax.annotation:javax.annotation-api:1.3.2" testImplementation "org.apache.openwebbeans:openwebbeans-se:2.0.27" @@ -56,12 +56,12 @@ dependencies { testImplementation "edu.umd.cs.mtc:multithreadedtc" testImplementation "org.springframework.data:spring-data-geode-test" testImplementation "org.testcontainers:testcontainers" + testImplementation "ch.qos.logback:logback-classic" testRuntimeOnly("org.apache.derby:derbyLocale_zh_TW:10.9.1.0") { exclude group: "org.springframework.data", module: "spring-data-geode" } - testRuntimeOnly "ch.qos.logback:logback-classic" testRuntimeOnly "org.apache.logging.log4j:log4j-to-slf4j" testRuntimeOnly "org.iq80.snappy:snappy" testRuntimeOnly "org.springframeork.shell:spring-shell"