This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch release/1.9.2
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/release/1.9.2 by this push:
new 4857721 GEODE-7261: Include spring-core in the geode-web war artifact
4857721 is described below
commit 4857721cfc7d7b6cf76b958eec3388d9eb4d6822
Author: Jens Deppe <[email protected]>
AuthorDate: Thu Oct 3 07:41:29 2019 -0700
GEODE-7261: Include spring-core in the geode-web war artifact
---
geode-web/build.gradle | 6 +++---
geode-web/src/test/resources/expected-pom.xml | 8 ++------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index f92a6e6..9acf365 100644
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -28,17 +28,17 @@ dependencies {
runtimeOnly('org.springframework:spring-aspects') {
exclude module: 'aspectjweaver'
exclude module: 'aopalliance'
- exclude module: 'spring-core'
+ exclude module: 'commons-logging'
}
runtimeOnly('org.springframework:spring-oxm') {
exclude module: 'commons-logging'
exclude module: 'spring-beans'
- exclude module: 'spring-core'
+ exclude module: 'commons-logging'
}
runtimeOnly('org.springframework:spring-webmvc') {
exclude module: 'aopalliance'
exclude module: 'aspectjweaver'
- exclude module: 'spring-core'
+ exclude module: 'commons-logging'
}
runtimeOnly('commons-fileupload:commons-fileupload') {
exclude module: 'commons-io'
diff --git a/geode-web/src/test/resources/expected-pom.xml
b/geode-web/src/test/resources/expected-pom.xml
index ac5cd4d..3072af9 100644
--- a/geode-web/src/test/resources/expected-pom.xml
+++ b/geode-web/src/test/resources/expected-pom.xml
@@ -52,7 +52,7 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>spring-core</artifactId>
+ <artifactId>commons-logging</artifactId>
<groupId>*</groupId>
</exclusion>
<exclusion>
@@ -75,10 +75,6 @@
<groupId>*</groupId>
</exclusion>
<exclusion>
- <artifactId>spring-core</artifactId>
- <groupId>*</groupId>
- </exclusion>
- <exclusion>
<artifactId>commons-logging</artifactId>
<groupId>*</groupId>
</exclusion>
@@ -90,7 +86,7 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>spring-core</artifactId>
+ <artifactId>commons-logging</artifactId>
<groupId>*</groupId>
</exclusion>
<exclusion>
