GEODE-7261: Include spring-core in the geode-web war artifact (apache…

…#4112)
shjgiser · Oct 3, 2019 · 59e22db · 59e22db
1 parent 75564e8
commit 59e22db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -51,6 +51,10 @@
       <artifactId>geode-core</artifactId>
       <scope>compile</scope>
       <exclusions>
+        <exclusion>
+          <artifactId>spring-core</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>spring-web</artifactId>
           <groupId>*</groupId>