From 5c5032e4a2f8b4435957177eabdb48a1af9206d7 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 22 Aug 2019 22:23:04 -0700 Subject: [PATCH] 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. --- apache-geode-extensions/apache-geode-extensions.gradle | 6 +++++- .../spring-gemfire-starter-session.gradle | 2 +- .../spring-gemfire-starter-test.gradle | 5 +++-- spring-gemfire-starter/spring-gemfire-starter.gradle | 1 + .../spring-geode-actuator-autoconfigure.gradle | 1 + spring-geode-actuator/spring-geode-actuator.gradle | 1 + .../spring-geode-autoconfigure.gradle | 9 +++++---- .../actuator/spring-geode-samples-boot-actuator.gradle | 1 + .../spring-geode-samples-boot-configuration.gradle | 1 + .../spring-geode-samples-caching-httpsession.gradle | 2 +- .../inline/spring-geode-samples-caching-inline.gradle | 5 ++--- .../spring-geode-samples-caching-lookaside.gradle | 5 ++--- .../near/spring-geode-samples-caching-near.gradle | 4 ++-- .../spring-geode-starter-session.gradle | 2 +- .../spring-geode-starter-test.gradle | 5 +++-- spring-geode-starter/spring-geode-starter.gradle | 4 ++-- spring-geode/spring-geode.gradle | 2 ++ 17 files changed, 34 insertions(+), 22 deletions(-) diff --git a/apache-geode-extensions/apache-geode-extensions.gradle b/apache-geode-extensions/apache-geode-extensions.gradle index 87c175ad..9c1ef97b 100644 --- a/apache-geode-extensions/apache-geode-extensions.gradle +++ b/apache-geode-extensions/apache-geode-extensions.gradle @@ -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" diff --git a/spring-gemfire-starter-session/spring-gemfire-starter-session.gradle b/spring-gemfire-starter-session/spring-gemfire-starter-session.gradle index 88a9d461..1e468d99 100644 --- a/spring-gemfire-starter-session/spring-gemfire-starter-session.gradle +++ b/spring-gemfire-starter-session/spring-gemfire-starter-session.gradle @@ -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" diff --git a/spring-gemfire-starter-test/spring-gemfire-starter-test.gradle b/spring-gemfire-starter-test/spring-gemfire-starter-test.gradle index 27147f4a..df03c68a 100644 --- a/spring-gemfire-starter-test/spring-gemfire-starter-test.gradle +++ b/spring-gemfire-starter-test/spring-gemfire-starter-test.gradle @@ -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" } diff --git a/spring-gemfire-starter/spring-gemfire-starter.gradle b/spring-gemfire-starter/spring-gemfire-starter.gradle index 021efa58..44d65ff1 100644 --- a/spring-gemfire-starter/spring-gemfire-starter.gradle +++ b/spring-gemfire-starter/spring-gemfire-starter.gradle @@ -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" } diff --git a/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle b/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle index b82e8fdd..cd9cdaed 100644 --- a/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle +++ b/spring-geode-actuator-autoconfigure/spring-geode-actuator-autoconfigure.gradle @@ -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" } diff --git a/spring-geode-actuator/spring-geode-actuator.gradle b/spring-geode-actuator/spring-geode-actuator.gradle index ca75740f..ae580795 100644 --- a/spring-geode-actuator/spring-geode-actuator.gradle +++ b/spring-geode-actuator/spring-geode-actuator.gradle @@ -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" } diff --git a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle index 66e6268f..fd89f5de 100644 --- a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle +++ b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle @@ -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" + //} } diff --git a/spring-geode-samples/boot/actuator/spring-geode-samples-boot-actuator.gradle b/spring-geode-samples/boot/actuator/spring-geode-samples-boot-actuator.gradle index a4b14256..62876c0f 100644 --- a/spring-geode-samples/boot/actuator/spring-geode-samples-boot-actuator.gradle +++ b/spring-geode-samples/boot/actuator/spring-geode-samples-boot-actuator.gradle @@ -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" } diff --git a/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle b/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle index b9af4689..de4a7ad8 100644 --- a/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle +++ b/spring-geode-samples/boot/configuration/spring-geode-samples-boot-configuration.gradle @@ -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" } diff --git a/spring-geode-samples/caching/http-session/spring-geode-samples-caching-httpsession.gradle b/spring-geode-samples/caching/http-session/spring-geode-samples-caching-httpsession.gradle index 549ddc11..cc97c49f 100644 --- a/spring-geode-samples/caching/http-session/spring-geode-samples-caching-httpsession.gradle +++ b/spring-geode-samples/caching/http-session/spring-geode-samples-caching-httpsession.gradle @@ -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" } diff --git a/spring-geode-samples/caching/inline/spring-geode-samples-caching-inline.gradle b/spring-geode-samples/caching/inline/spring-geode-samples-caching-inline.gradle index 2281bb32..ff7df82e 100644 --- a/spring-geode-samples/caching/inline/spring-geode-samples-caching-inline.gradle +++ b/spring-geode-samples/caching/inline/spring-geode-samples-caching-inline.gradle @@ -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" } diff --git a/spring-geode-samples/caching/look-aside/spring-geode-samples-caching-lookaside.gradle b/spring-geode-samples/caching/look-aside/spring-geode-samples-caching-lookaside.gradle index cb1ef485..2ba61170 100644 --- a/spring-geode-samples/caching/look-aside/spring-geode-samples-caching-lookaside.gradle +++ b/spring-geode-samples/caching/look-aside/spring-geode-samples-caching-lookaside.gradle @@ -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" } diff --git a/spring-geode-samples/caching/near/spring-geode-samples-caching-near.gradle b/spring-geode-samples/caching/near/spring-geode-samples-caching-near.gradle index 7ffe5db4..badd4fbf 100644 --- a/spring-geode-samples/caching/near/spring-geode-samples-caching-near.gradle +++ b/spring-geode-samples/caching/near/spring-geode-samples-caching-near.gradle @@ -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" } diff --git a/spring-geode-starter-session/spring-geode-starter-session.gradle b/spring-geode-starter-session/spring-geode-starter-session.gradle index edc23a61..038b5082 100644 --- a/spring-geode-starter-session/spring-geode-starter-session.gradle +++ b/spring-geode-starter-session/spring-geode-starter-session.gradle @@ -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" diff --git a/spring-geode-starter-test/spring-geode-starter-test.gradle b/spring-geode-starter-test/spring-geode-starter-test.gradle index 0ea303ba..0c8323d4 100644 --- a/spring-geode-starter-test/spring-geode-starter-test.gradle +++ b/spring-geode-starter-test/spring-geode-starter-test.gradle @@ -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" } diff --git a/spring-geode-starter/spring-geode-starter.gradle b/spring-geode-starter/spring-geode-starter.gradle index 2e0f64b9..01562b83 100644 --- a/spring-geode-starter/spring-geode-starter.gradle +++ b/spring-geode-starter/spring-geode-starter.gradle @@ -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' diff --git a/spring-geode/spring-geode.gradle b/spring-geode/spring-geode.gradle index d0cbb10f..fd0e5e11 100644 --- a/spring-geode/spring-geode.gradle +++ b/spring-geode/spring-geode.gradle @@ -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" }