Exclude the 'javax.servlet:javax.servlet-api' transitive dependency from 'geode-core'.
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:
@@ -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"
|
||||
}
|
||||
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
|
||||
@@ -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,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"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user