Refactor logging dependencies in SBDG Module Gradle build files.

Remove the exclude for 'org.apache.logging.log4j:log4j-to-slf4j'.

Add an exclude for 'org.apache.logging.log4j:log4j-core'.

Resolves gh-42.
This commit is contained in:
John Blum
2019-08-01 23:49:22 -07:00
parent c7963259f1
commit c218795e8d
10 changed files with 68 additions and 79 deletions

View File

@@ -4,10 +4,21 @@ description = "Apache Geode Extensions"
dependencies {
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("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"
}
testCompile "org.assertj:assertj-core"
testCompile "junit:junit"

View File

@@ -8,16 +8,15 @@ dependencies {
compile project(":spring-geode-actuator")
compile project(":spring-geode-autoconfigure")
testCompile "org.assertj:assertj-core"
testCompile "junit:junit"
testCompile "org.assertj:assertj-core"
testCompile "org.mockito:mockito-core"
testCompile "org.projectlombok:lombok"
testCompile "org.springframework.boot:spring-boot-starter-test"
testCompile "edu.umd.cs.mtc:multithreadedtc"
testCompile("org.springframework.boot:spring-boot-starter-test") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
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"
}

View File

@@ -7,20 +7,17 @@ dependencies {
compile project(":spring-geode")
compile ("org.springframework.boot:spring-boot-starter-actuator") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
}
compile "org.springframework.boot:spring-boot-starter-actuator"
testCompile "org.assertj:assertj-core"
testCompile "junit:junit"
testCompile "org.assertj:assertj-core"
testCompile "org.mockito:mockito-core"
testCompile "org.projectlombok:lombok"
testCompile "org.springframework.boot:spring-boot-starter-test"
testCompile "edu.umd.cs.mtc:multithreadedtc"
testCompile("org.springframework.boot:spring-boot-starter-test") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
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"
}

View File

@@ -13,34 +13,29 @@ 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"
optional("org.springframework.session:spring-session-data-geode") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
provided "javax.servlet:javax.servlet-api"
testCompile project(":apache-geode-extensions")
testCompile "org.assertj:assertj-core"
testCompile "junit:junit"
testCompile "org.assertj:assertj-core"
testCompile "org.mockito:mockito-core"
testCompile "org.projectlombok:lombok"
testCompile "org.springframework.boot:spring-boot-starter-test"
testCompile "edu.umd.cs.mtc:multithreadedtc"
testCompile("org.springframework.boot:spring-boot-starter-test") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
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 "javax.cache:cache-api"
testRuntime("org.springframework.boot:spring-boot-starter-web") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
}
testRuntime("org.springframework.boot:spring-boot-starter-jetty") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
}
testRuntime "org.springframework.boot:spring-boot-starter-web"
testRuntime "org.springframework.boot:spring-boot-starter-jetty"
testRuntime "org.springframework.shell:spring-shell:$springShellVersion"
// Runtime Test dependency on Spring Cloud Services (SCS) to verify workaround to SCS problem!

View File

@@ -11,8 +11,8 @@ dependencies {
testCompile "org.assertj:assertj-core"
testCompile "org.mockito:mockito-core"
testCompile "org.projectlombok:lombok"
testCompile "edu.umd.cs.mtc:multithreadedtc"
testCompile "org.springframework:spring-test"
testCompile "edu.umd.cs.mtc:multithreadedtc"
}

View File

@@ -10,15 +10,14 @@ dependencies {
compile project(":spring-geode-starter-actuator")
compile ("org.springframework.boot:spring-boot-starter-web") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
compile "org.springframework.boot:spring-boot-starter-web"
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"
runtime ("org.springframework.boot:spring-boot-starter-jetty") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
}
runtime "org.springframework.boot:spring-boot-starter-jetty"
runtime "org.springframework.shell:spring-shell"
}

View File

@@ -12,6 +12,10 @@ dependencies {
compile project(":spring-geode-starter")
compile("org.springframework.data:spring-data-geode-test") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
compile "org.assertj:assertj-core"
compile "org.projectlombok:lombok"
compile "org.springframework.data:spring-data-geode-test"

View File

@@ -10,29 +10,21 @@ dependencies {
compile project(":spring-geode-starter")
compile ("org.springframework.boot:spring-boot-starter-data-jpa") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
}
compile ("org.springframework.boot:spring-boot-starter-web") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
}
compile "org.projectlombok:lombok"
compile "org.springframework.boot:spring-boot-starter-data-jpa"
compile "org.springframework.boot:spring-boot-starter-web"
runtime "javax.cache:cache-api"
runtime "org.hsqldb:hsqldb"
runtime "org.springframework.boot:spring-boot-starter-jetty"
runtime "org.springframework.shell:spring-shell"
runtime ("org.springframework.boot:spring-boot-starter-jetty") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
testCompile "org.springframework.boot:spring-boot-starter-test"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
testCompile("org.springframework.boot:spring-boot-starter-test") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
}
testCompile "org.springframework.data:spring-data-geode-test"
}
bootJar {

View File

@@ -6,22 +6,18 @@ dependencies {
compile project(":spring-geode-starter")
compile ("org.springframework.boot:spring-boot-starter-web") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
}
compile "org.springframework.boot:spring-boot-starter-web"
runtime "javax.cache:cache-api"
runtime "org.springframework.boot:spring-boot-starter-jetty"
runtime "org.springframework.shell:spring-shell"
runtime ("org.springframework.boot:spring-boot-starter-jetty") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
testCompile "org.springframework.boot:spring-boot-starter-test"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
testCompile("org.springframework.boot:spring-boot-starter-test") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
}
testCompile "org.springframework.data:spring-data-geode-test"
}
bootJar {

View File

@@ -11,34 +11,30 @@ dependencies {
compile "org.springframework:spring-context-support"
compile "org.springframework:spring-jcl"
compile "org.springframework.data:spring-data-geode"
compile "org.springframework.boot:spring-boot-starter"
compile("org.springframework.boot:spring-boot-starter") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
compile("org.springframework.data:spring-data-geode") {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
testCompile "org.assertj:assertj-core"
testCompile "junit:junit"
testCompile "org.assertj:assertj-core"
testCompile "org.mockito:mockito-core"
testCompile "org.projectlombok:lombok"
testCompile "org.testcontainers:testcontainers"
testCompile "edu.umd.cs.mtc:multithreadedtc"
testCompile("org.springframework.boot:spring-boot-starter-test") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
exclude group: "org.skyscreamer", module: "jsonassert"
}
testCompile("org.springframework.boot:spring-boot-starter-data-jpa") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
}
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") {
exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
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"
}