Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove exclude from Apache Geode dependencies on 'org.apache.logging.log4j:log4j-core'.

Browse Source 
Resolves gh-48.
This commit is contained in:
John Blum
2020-09-18 02:06:27 -07:00
parent 74c4bdbcd9
commit 2aaaea76bf
8 changed files with 20 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apache-geode-extensions/apache-geode-extensions.gradle
View File

@@ -4,31 +4,20 @@ description = "Apache Geode Extensions"
dependencies {
compile("org.apache.geode:geode-core:$apacheGeodeVersion") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
compile("org.apache.geode:geode-cq:$apacheGeodeVersion") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
compile("org.apache.geode:geode-lucene:$apacheGeodeVersion") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
compile("org.apache.geode:geode-wan:$apacheGeodeVersion") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
compile "org.apache.geode:geode-core:$apacheGeodeVersion"
compile "org.apache.geode:geode-cq:$apacheGeodeVersion"
compile "org.apache.geode:geode-lucene:$apacheGeodeVersion"
compile "org.apache.geode:geode-wan:$apacheGeodeVersion"
compile "com.fasterxml.jackson.core:jackson-databind"
testCompile "org.apache.geode:geode-membership:$apacheGeodeVersion"
testCompile "org.apache.geode:geode-serialization:$apacheGeodeVersion"
testCompile "junit:junit"
testCompile "org.assertj:assertj-core"
testCompile "org.mockito:mockito-core"
testCompile "org.projectlombok:lombok"
testCompile "edu.umd.cs.mtc:multithreadedtc"
testCompile "org.apache.geode:geode-membership:$apacheGeodeVersion"
testCompile "org.apache.geode:geode-serialization:$apacheGeodeVersion"
}

7
spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle
View File

@@ -1,7 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
apply from: MAVEN_POM_EDITOR_GRADLE
description = "Spring Boot for Apache Geode Actuator Auto-Configuration"
description = "Spring Boot Actuator Auto-Configuration for Apache Geode"
dependencies {
@@ -15,10 +15,7 @@ dependencies {
testCompile "org.mockito:mockito-core"
testCompile "org.projectlombok:lombok"
testCompile "org.springframework.boot:spring-boot-starter-test"
testCompile "org.springframework.data:spring-data-geode-test"
testCompile "edu.umd.cs.mtc:multithreadedtc"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
}

7
spring-geode-actuator/spring-geode-actuator.gradle
View File

@@ -1,7 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
apply from: MAVEN_POM_EDITOR_GRADLE
description = "Spring Boot for Apache Geode Actuator"
description = "Spring Boot Actuator for Apache Geode"
dependencies {
@@ -17,10 +17,7 @@ dependencies {
testCompile "org.mockito:mockito-core"
testCompile "org.projectlombok:lombok"
testCompile "org.springframework.boot:spring-boot-starter-test"
testCompile "org.springframework.data:spring-data-geode-test"
testCompile "edu.umd.cs.mtc:multithreadedtc"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
}

13
spring-geode-autoconfigure/spring-geode-autoconfigure.gradle
View File

@@ -5,7 +5,7 @@ plugins {
apply plugin: 'io.spring.convention.spring-module'
apply from: MAVEN_POM_EDITOR_GRADLE
description = "Spring Boot for Apache Geode Auto-Configuration"
description = "Spring Boot Auto-Configuration for Apache Geode"
dependencies {
@@ -17,10 +17,7 @@ dependencies {
optional "org.springframework.boot:spring-boot-autoconfigure-processor"
optional "org.springframework.boot:spring-boot-configuration-processor"
optional("org.springframework.session:spring-session-data-geode") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
optional "org.springframework.session:spring-session-data-geode"
testCompile "jakarta.servlet:jakarta.servlet-api"
testCompile "junit:junit"
@@ -29,12 +26,9 @@ dependencies {
testCompile "org.projectlombok:lombok"
testCompile "org.springframework.boot:spring-boot-starter-test"
testCompile "org.springframework.boot:spring-boot-starter-web"
testCompile "org.springframework.data:spring-data-geode-test"
testCompile "edu.umd.cs.mtc:multithreadedtc"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
testCompileOnly "com.google.code.findbugs:jsr305:$findbugsVersion"
testRuntime "javax.cache:cache-api"
@@ -48,4 +42,5 @@ dependencies {
//testRuntime("io.pivotal.spring.cloud:spring-cloud-services-starter-service-registry:2.0.3.RELEASE") {
// exclude group: "org.apache.logging.log4j", module: "log4j-core"
//}
}

5
spring-geode-samples/boot/actuator/spring-geode-samples-boot-actuator.gradle
View File

@@ -9,10 +9,7 @@ description = "Spring Geode Sample demonstrating the use of Spring Boot Actuator
dependencies {
compile project(":spring-geode-starter-actuator")
compile(project(":spring-geode-starter-test")) {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
compile project(":spring-geode-starter-test")
compile "org.springframework.boot:spring-boot-starter-web"

4
spring-geode-starter-session/spring-geode-starter-session.gradle
View File

@@ -7,8 +7,6 @@ dependencies {
compile project(':spring-geode-starter')
compile('org.springframework.session:spring-session-data-geode') {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
compile 'org.springframework.session:spring-session-data-geode'
}

5
spring-geode-starter-test/spring-geode-starter-test.gradle
View File

@@ -8,9 +8,6 @@ dependencies {
compile project(':spring-geode-starter')
compile "org.springframework.boot:spring-boot-starter-test"
compile('org.springframework.data:spring-data-geode-test') {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
compile 'org.springframework.data:spring-data-geode-test'
}

10
spring-geode/spring-geode.gradle
View File

@@ -14,10 +14,7 @@ dependencies {
compile "org.springframework:spring-context-support"
compile "org.springframework:spring-jcl"
compile "org.springframework.boot:spring-boot-starter"
compile("org.springframework.data:spring-data-geode") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
compile "org.springframework.data:spring-data-geode"
compileOnly "com.google.code.findbugs:jsr305:$findbugsVersion"
@@ -36,10 +33,7 @@ dependencies {
testCompile "org.springframework.boot:spring-boot-starter-data-jpa"
testCompile "org.springframework.boot:spring-boot-starter-data-cassandra"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
testCompile "org.springframework.data:spring-data-geode-test"
testRuntime "org.hsqldb:hsqldb"