[geode] branch develop updated: GEODE-7261: Include spring-core in the geode-web war artifact (#4112)

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 59e22db  GEODE-7261: Include spring-core in the geode-web war artifact (#4112)
59e22db is described below

commit 59e22db92b0331bb4a2d9533fe75702adc9f3d0e
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Thu Oct 3 07:40:21 2019 -0700

    GEODE-7261: Include spring-core in the geode-web war artifact (#4112)
---
 geode-web/build.gradle                        | 3 ++-
 geode-web/src/test/resources/expected-pom.xml | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index b006261..526649f 100644
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -32,9 +32,10 @@ dependencies {
   providedCompile(project(path: ':geode-core')) {
     //spring-web is excluded from the providedCompile configuration to ensure
     //that it is included as part of the war. spring-web must be loaded with the war's
-    //classloader to interoperate correctly with it's optional dependences that are included
+    //classloader to interoperate correctly with it's optional dependencies that are included
     //in this war, in particular commons-fileupload.
     exclude module: 'spring-web'
+    exclude module: 'spring-core'
   }
   providedCompile(platform(project(':boms:geode-all-bom')))
   providedCompile('javax.servlet:javax.servlet-api')
diff --git a/geode-web/src/test/resources/expected-pom.xml b/geode-web/src/test/resources/expected-pom.xml
index 160eee8..3e23643 100644
--- a/geode-web/src/test/resources/expected-pom.xml
+++ b/geode-web/src/test/resources/expected-pom.xml
@@ -52,6 +52,10 @@
       <scope>compile</scope>
       <exclusions>
         <exclusion>
+          <artifactId>spring-core</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+        <exclusion>
           <artifactId>spring-web</artifactId>
           <groupId>*</groupId>
         </exclusion>