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

Exclude the 'javax.servlet:javax.servlet-api' transitive dependency from 'geode-core'.

Browse Source 
Exclude the 'javax.servlet:javax.servlet-api' transitive dependency except from in the 'spring-geode-starter-session' and 'spring-gemfire-starter-session' modules.

Remove unnecessary 'javax.servlet:javax.servlet-api' provided dependency in 'spring-geode-autoconfigure'.

Remove unnecessary 'org.springframework.boot:spring-boot-starter-tomcat' runtime dependency from 'spring-geode-samples-caching-httpsession'.

Remove unnecessary 'javax.cache:cache-api' and 'org.springframework.shell:spring-shell' runtime dependencies from 'spring-geode-samples-caching-inline'.

Remove unnecessary 'javax.cache:cache-api' and 'org.springframework.shell:spring-shell' runtime dependencies from 'spring-geode-samples-caching-lookaside'.

Remove unnecessary 'javax.cache:cache-api' runtime dependency from 'spring-geode-samples-caching-near'.

Resolves gh-47.
This commit is contained in:
John Blum
2019-08-22 22:23:04 -07:00
parent c2e311c47f
commit 5c5032e4a2
17 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,23 +5,27 @@ description = "Apache Geode Extensions"
dependencies {
compile("org.apache.geode:geode-core:$apacheGeodeVersion") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
compile("org.apache.geode:geode-cq:$apacheGeodeVersion") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
compile("org.apache.geode:geode-lucene:$apacheGeodeVersion") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
compile("org.apache.geode:geode-wan:$apacheGeodeVersion") {
exclude group: "javax.servlet", module: "javax.servlet-api"
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 "edu.umd.cs.mtc:multithreadedtc"

2
spring-gemfire-starter-session/spring-gemfire-starter-session.gradle
View File

@@ -5,7 +5,7 @@ description = "Spring Boot Starter for Spring Session using Pivotal GemFire"
dependencies {
compile(project(':spring-gemfire-starter'))
compile project(':spring-gemfire-starter')
compile('org.springframework.session:spring-session-data-gemfire') {
exclude group: "org.apache.logging.log4j", module: "log4j-core"

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

@@ -5,11 +5,12 @@ description = "Spring Boot Test Starter for Pivotal GemFire"
dependencies {
compile project(':spring-gemfire-starter')
compile "org.springframework.boot:spring-boot-starter-test"
compile(project(':spring-gemfire-starter'));
testCompile("org.springframework.data:spring-data-gemfire-test:$springDataGeodeTestVersion") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}

1
spring-gemfire-starter/spring-gemfire-starter.gradle
View File

@@ -16,6 +16,7 @@ dependencies {
}
compile("org.springframework.data:spring-data-gemfire") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}

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

@@ -16,6 +16,7 @@ dependencies {
testCompile "edu.umd.cs.mtc:multithreadedtc"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}

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

@@ -17,6 +17,7 @@ dependencies {
testCompile "edu.umd.cs.mtc:multithreadedtc"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}

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

@@ -18,7 +18,7 @@ dependencies {
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
provided "javax.servlet:javax.servlet-api"
//provided "javax.servlet:javax.servlet-api"
testCompile project(":apache-geode-extensions")
@@ -30,6 +30,7 @@ dependencies {
testCompile "edu.umd.cs.mtc:multithreadedtc"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
@@ -39,7 +40,7 @@ dependencies {
testRuntime "org.springframework.shell:spring-shell:$springShellVersion"
// Runtime Test dependency on Spring Cloud Services (SCS) to verify workaround to SCS problem!
// testRuntime("io.pivotal.spring.cloud:spring-cloud-services-starter-service-registry:2.0.3.RELEASE") {
// exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
// }
//testRuntime("io.pivotal.spring.cloud:spring-cloud-services-starter-service-registry:2.0.3.RELEASE") {
// exclude group: "org.apache.logging.log4j", module: "log4j-core"
//}
}

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

@@ -13,6 +13,7 @@ dependencies {
compile "org.springframework.boot:spring-boot-starter-web"
compile("org.springframework.data:spring-data-geode-test") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}

1
spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle
View File

@@ -16,6 +16,7 @@ dependencies {
compile "org.projectlombok:lombok"
compile("org.springframework.data:spring-data-geode-test") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}

2
spring-geode-samples/caching/http-session/spring-geode-samples-caching-httpsession.gradle
View File

@@ -11,13 +11,13 @@ dependencies {
// runtime project(":spring-geode-starter-session")
runtime "org.springframework.boot:spring-boot-starter-thymeleaf"
runtime "org.springframework.boot:spring-boot-starter-tomcat"
testCompile project(":spring-geode-starter-session")
testCompile "org.springframework.boot:spring-boot-starter-test"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}

5
spring-geode-samples/caching/inline/spring-geode-samples-caching-inline.gradle
View File

@@ -4,7 +4,7 @@ plugins {
apply plugin: 'io.spring.convention.spring-sample-boot'
description = "Spring Geode Sample demonstrating Spring's Cache Abstraction using Apache Geode as the caching provider with Inline Caching."
description = "Spring Geode Sample demonstrating Spring's Cache Abstraction using Apache Geode as the caching provider for Inline Caching."
dependencies {
@@ -14,14 +14,13 @@ dependencies {
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"
testCompile "org.springframework.boot:spring-boot-starter-test"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}

5
spring-geode-samples/caching/look-aside/spring-geode-samples-caching-lookaside.gradle
View File

@@ -1,6 +1,6 @@
apply plugin: 'io.spring.convention.spring-sample-boot'
description = "Spring Geode Sample demonstrating Spring's Cache Abstraction using Apache Geode as the caching provider with Look-Aside Caching."
description = "Spring Geode Sample demonstrating Spring's Cache Abstraction using Apache Geode as the caching provider for Look-Aside Caching."
dependencies {
@@ -8,13 +8,12 @@ dependencies {
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"
testCompile "org.springframework.boot:spring-boot-starter-test"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}

4
spring-geode-samples/caching/near/spring-geode-samples-caching-near.gradle
View File

@@ -4,7 +4,7 @@ plugins {
apply plugin: 'io.spring.convention.spring-sample-boot'
description = "Spring Geode Sample demonstrating Spring's Cache Abstraction using Apache Geode as the caching provider with Near Caching."
description = "Spring Geode Sample demonstrating Spring's Cache Abstraction using Apache Geode as the caching provider for Near Caching."
dependencies {
@@ -15,12 +15,12 @@ dependencies {
compile "org.projectlombok:lombok"
compile "org.springframework.boot:spring-boot-starter-web"
runtime "javax.cache:cache-api"
runtime "org.springframework.boot:spring-boot-starter-jetty"
testCompile "org.springframework.boot:spring-boot-starter-test"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}

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

@@ -5,7 +5,7 @@ description = "Spring Boot Starter for Spring Session using Apache Geode"
dependencies {
compile(project(':spring-geode-starter'))
compile project(':spring-geode-starter')
compile('org.springframework.session:spring-session-data-geode') {
exclude group: "org.apache.logging.log4j", module: "log4j-core"

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

@@ -5,11 +5,12 @@ description = "Spring Boot Test Starter for Apache Geode"
dependencies {
compile project(':spring-geode-starter')
compile "org.springframework.boot:spring-boot-starter-test"
compile(project(':spring-geode-starter'))
testCompile('org.springframework.data:spring-data-geode-test') {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}

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

@@ -7,8 +7,8 @@ dependencies {
compile "org.springframework.boot:spring-boot-starter"
compile(project(':spring-geode'))
compile(project(':spring-geode-autoconfigure'))
compile project(':spring-geode')
compile project(':spring-geode-autoconfigure')
runtime 'javax.cache:cache-api'
runtime 'org.springframework.shell:spring-shell'

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

@@ -14,6 +14,7 @@ dependencies {
compile "org.springframework.boot:spring-boot-starter"
compile("org.springframework.data:spring-data-geode") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}
@@ -32,6 +33,7 @@ dependencies {
testCompile "org.springframework.boot:spring-boot-starter-data-cassandra"
testCompile("org.springframework.data:spring-data-geode-test") {
exclude group: "javax.servlet", module: "javax.servlet-api"
exclude group: "org.apache.logging.log4j", module: "log4j-core"
}