You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/03/21 22:14:14 UTC
[1/2] incubator-geode git commit: GEODE-27: Adding spring-expression
back in to geode-web
Repository: incubator-geode
Updated Branches:
refs/heads/develop f1ff67cbb -> 59fa50d4f
GEODE-27: Adding spring-expression back in to geode-web
Not tests are failing due to this, but I discovered in a manual test of
launching a locator that we were seeing errors due to the fact that the
geode-web war could not be launched due to a missing spring expression
class.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/59fa50d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/59fa50d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/59fa50d4
Branch: refs/heads/develop
Commit: 59fa50d4f28acc6218614972b878018909c7d7ff
Parents: 738628c
Author: Dan Smith <up...@apache.org>
Authored: Fri Mar 18 16:54:52 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Mon Mar 21 14:13:20 2016 -0700
----------------------------------------------------------------------
geode-web/build.gradle | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/59fa50d4/geode-web/build.gradle
----------------------------------------------------------------------
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index 1173705..a2a3dd1 100755
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -22,7 +22,6 @@ dependencies {
exclude module: 'aspectjweaver'
exclude module: 'aopalliance'
exclude module: 'spring-core'
- exclude module: 'spring-expression'
}
runtime ('org.springframework:spring-oxm:' + project.'springframework.version') {
exclude module: 'commons-logging'
@@ -33,7 +32,6 @@ dependencies {
exclude module: 'aopalliance'
exclude module: 'aspectjweaver'
exclude module: 'spring-core'
- exclude module: 'spring-expression'
}
runtime ('commons-fileupload:commons-fileupload:' + project.'commons-fileupload.version') {
exclude module: 'commons-io'
[2/2] incubator-geode git commit: GEODE-27: Adding spring-webmvc to
pulse
Posted by up...@apache.org.
GEODE-27: Adding spring-webmvc to pulse
Removing spring-webmvc from pulse caused these integration tests to fail:
com.gemstone.gemfire.distributed.LocatorLauncherAssemblyJUnitTest.testLocatorStopsWhenJmxPortIsZero
com.gemstone.gemfire.distributed.LocatorLauncherAssemblyJUnitTest.testLocatorStopsWhenJmxPortIsNonZero
com.gemstone.gemfire.management.internal.configuration.SharedConfigurationEndToEndDUnitTest.testStartServerAndExecuteCommands
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/738628c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/738628c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/738628c3
Branch: refs/heads/develop
Commit: 738628c3e7f98f74206c3009574e6ed5c7d10f9a
Parents: f1ff67c
Author: Dan Smith <up...@apache.org>
Authored: Mon Mar 21 10:18:00 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Mon Mar 21 14:13:20 2016 -0700
----------------------------------------------------------------------
geode-pulse/build.gradle | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/738628c3/geode-pulse/build.gradle
----------------------------------------------------------------------
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index 045d903..862bacb 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -54,6 +54,10 @@ dependencies {
exclude module: 'spring-expression'
exclude module: 'spring-jdbc'
}
+ runtime ('org.springframework:spring-webmvc:' + project.'springframework.version') {
+ exclude module: 'aopalliance'
+ exclude module: 'aspectjweaver'
+ }
compile 'org.springframework:spring-tx:' + project.'spring-tx.version'
compile 'com.fasterxml.jackson.core:jackson-annotations:' + project.'jackson.version'
compile 'com.fasterxml.jackson.core:jackson-core:' + project.'jackson.version'