Remove exclude from Apache Geode dependencies on 'org.apache.logging.log4j:log4j-core'.
Resolves gh-48.
This commit is contained in:
@@ -4,31 +4,20 @@ description = "Apache Geode Extensions"
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
||||||
compile("org.apache.geode:geode-core:$apacheGeodeVersion") {
|
compile "org.apache.geode:geode-core:$apacheGeodeVersion"
|
||||||
exclude group: "org.apache.logging.log4j", module: "log4j-core"
|
compile "org.apache.geode:geode-cq:$apacheGeodeVersion"
|
||||||
}
|
compile "org.apache.geode:geode-lucene:$apacheGeodeVersion"
|
||||||
|
compile "org.apache.geode:geode-wan:$apacheGeodeVersion"
|
||||||
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 "com.fasterxml.jackson.core:jackson-databind"
|
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 "junit:junit"
|
||||||
testCompile "org.assertj:assertj-core"
|
testCompile "org.assertj:assertj-core"
|
||||||
testCompile "org.mockito:mockito-core"
|
testCompile "org.mockito:mockito-core"
|
||||||
testCompile "org.projectlombok:lombok"
|
testCompile "org.projectlombok:lombok"
|
||||||
testCompile "edu.umd.cs.mtc:multithreadedtc"
|
testCompile "edu.umd.cs.mtc:multithreadedtc"
|
||||||
|
|
||||||
testCompile "org.apache.geode:geode-membership:$apacheGeodeVersion"
|
|
||||||
testCompile "org.apache.geode:geode-serialization:$apacheGeodeVersion"
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
apply plugin: 'io.spring.convention.spring-module'
|
apply plugin: 'io.spring.convention.spring-module'
|
||||||
apply from: MAVEN_POM_EDITOR_GRADLE
|
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 {
|
dependencies {
|
||||||
|
|
||||||
@@ -15,10 +15,7 @@ dependencies {
|
|||||||
testCompile "org.mockito:mockito-core"
|
testCompile "org.mockito:mockito-core"
|
||||||
testCompile "org.projectlombok:lombok"
|
testCompile "org.projectlombok:lombok"
|
||||||
testCompile "org.springframework.boot:spring-boot-starter-test"
|
testCompile "org.springframework.boot:spring-boot-starter-test"
|
||||||
|
testCompile "org.springframework.data:spring-data-geode-test"
|
||||||
testCompile "edu.umd.cs.mtc:multithreadedtc"
|
testCompile "edu.umd.cs.mtc:multithreadedtc"
|
||||||
|
|
||||||
testCompile("org.springframework.data:spring-data-geode-test") {
|
|
||||||
exclude group: "org.apache.logging.log4j", module: "log4j-core"
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
apply plugin: 'io.spring.convention.spring-module'
|
apply plugin: 'io.spring.convention.spring-module'
|
||||||
apply from: MAVEN_POM_EDITOR_GRADLE
|
apply from: MAVEN_POM_EDITOR_GRADLE
|
||||||
|
|
||||||
description = "Spring Boot for Apache Geode Actuator"
|
description = "Spring Boot Actuator for Apache Geode"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
||||||
@@ -17,10 +17,7 @@ dependencies {
|
|||||||
testCompile "org.mockito:mockito-core"
|
testCompile "org.mockito:mockito-core"
|
||||||
testCompile "org.projectlombok:lombok"
|
testCompile "org.projectlombok:lombok"
|
||||||
testCompile "org.springframework.boot:spring-boot-starter-test"
|
testCompile "org.springframework.boot:spring-boot-starter-test"
|
||||||
|
testCompile "org.springframework.data:spring-data-geode-test"
|
||||||
testCompile "edu.umd.cs.mtc:multithreadedtc"
|
testCompile "edu.umd.cs.mtc:multithreadedtc"
|
||||||
|
|
||||||
testCompile("org.springframework.data:spring-data-geode-test") {
|
|
||||||
exclude group: "org.apache.logging.log4j", module: "log4j-core"
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ plugins {
|
|||||||
apply plugin: 'io.spring.convention.spring-module'
|
apply plugin: 'io.spring.convention.spring-module'
|
||||||
apply from: MAVEN_POM_EDITOR_GRADLE
|
apply from: MAVEN_POM_EDITOR_GRADLE
|
||||||
|
|
||||||
description = "Spring Boot for Apache Geode Auto-Configuration"
|
description = "Spring Boot Auto-Configuration for Apache Geode"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
||||||
@@ -17,10 +17,7 @@ dependencies {
|
|||||||
|
|
||||||
optional "org.springframework.boot:spring-boot-autoconfigure-processor"
|
optional "org.springframework.boot:spring-boot-autoconfigure-processor"
|
||||||
optional "org.springframework.boot:spring-boot-configuration-processor"
|
optional "org.springframework.boot:spring-boot-configuration-processor"
|
||||||
|
optional "org.springframework.session:spring-session-data-geode"
|
||||||
optional("org.springframework.session:spring-session-data-geode") {
|
|
||||||
exclude group: "org.apache.logging.log4j", module: "log4j-core"
|
|
||||||
}
|
|
||||||
|
|
||||||
testCompile "jakarta.servlet:jakarta.servlet-api"
|
testCompile "jakarta.servlet:jakarta.servlet-api"
|
||||||
testCompile "junit:junit"
|
testCompile "junit:junit"
|
||||||
@@ -29,12 +26,9 @@ dependencies {
|
|||||||
testCompile "org.projectlombok:lombok"
|
testCompile "org.projectlombok:lombok"
|
||||||
testCompile "org.springframework.boot:spring-boot-starter-test"
|
testCompile "org.springframework.boot:spring-boot-starter-test"
|
||||||
testCompile "org.springframework.boot:spring-boot-starter-web"
|
testCompile "org.springframework.boot:spring-boot-starter-web"
|
||||||
|
testCompile "org.springframework.data:spring-data-geode-test"
|
||||||
testCompile "edu.umd.cs.mtc:multithreadedtc"
|
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"
|
testCompileOnly "com.google.code.findbugs:jsr305:$findbugsVersion"
|
||||||
|
|
||||||
testRuntime "javax.cache:cache-api"
|
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") {
|
//testRuntime("io.pivotal.spring.cloud:spring-cloud-services-starter-service-registry:2.0.3.RELEASE") {
|
||||||
// exclude group: "org.apache.logging.log4j", module: "log4j-core"
|
// exclude group: "org.apache.logging.log4j", module: "log4j-core"
|
||||||
//}
|
//}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,10 +9,7 @@ description = "Spring Geode Sample demonstrating the use of Spring Boot Actuator
|
|||||||
dependencies {
|
dependencies {
|
||||||
|
|
||||||
compile project(":spring-geode-starter-actuator")
|
compile project(":spring-geode-starter-actuator")
|
||||||
|
compile project(":spring-geode-starter-test")
|
||||||
compile(project(":spring-geode-starter-test")) {
|
|
||||||
exclude group: "org.apache.logging.log4j", module: "log4j-core"
|
|
||||||
}
|
|
||||||
|
|
||||||
compile "org.springframework.boot:spring-boot-starter-web"
|
compile "org.springframework.boot:spring-boot-starter-web"
|
||||||
|
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ dependencies {
|
|||||||
|
|
||||||
compile project(':spring-geode-starter')
|
compile project(':spring-geode-starter')
|
||||||
|
|
||||||
compile('org.springframework.session:spring-session-data-geode') {
|
compile 'org.springframework.session:spring-session-data-geode'
|
||||||
exclude group: "org.apache.logging.log4j", module: "log4j-core"
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,9 +8,6 @@ dependencies {
|
|||||||
compile project(':spring-geode-starter')
|
compile project(':spring-geode-starter')
|
||||||
|
|
||||||
compile "org.springframework.boot:spring-boot-starter-test"
|
compile "org.springframework.boot:spring-boot-starter-test"
|
||||||
|
compile 'org.springframework.data:spring-data-geode-test'
|
||||||
compile('org.springframework.data:spring-data-geode-test') {
|
|
||||||
exclude group: "org.apache.logging.log4j", module: "log4j-core"
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,10 +14,7 @@ dependencies {
|
|||||||
compile "org.springframework:spring-context-support"
|
compile "org.springframework:spring-context-support"
|
||||||
compile "org.springframework:spring-jcl"
|
compile "org.springframework:spring-jcl"
|
||||||
compile "org.springframework.boot:spring-boot-starter"
|
compile "org.springframework.boot:spring-boot-starter"
|
||||||
|
compile "org.springframework.data:spring-data-geode"
|
||||||
compile("org.springframework.data:spring-data-geode") {
|
|
||||||
exclude group: "org.apache.logging.log4j", module: "log4j-core"
|
|
||||||
}
|
|
||||||
|
|
||||||
compileOnly "com.google.code.findbugs:jsr305:$findbugsVersion"
|
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-jpa"
|
||||||
testCompile "org.springframework.boot:spring-boot-starter-data-cassandra"
|
testCompile "org.springframework.boot:spring-boot-starter-data-cassandra"
|
||||||
|
testCompile "org.springframework.data:spring-data-geode-test"
|
||||||
testCompile("org.springframework.data:spring-data-geode-test") {
|
|
||||||
exclude group: "org.apache.logging.log4j", module: "log4j-core"
|
|
||||||
}
|
|
||||||
|
|
||||||
testRuntime "org.hsqldb:hsqldb"
|
testRuntime "org.hsqldb:hsqldb"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user