[22/36] incubator-geode git commit: GEODE-1203: include spring-web in gfshDependency.jar

[hi...@apache.org]

GEODE-1203: include spring-web in gfshDependency.jar


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/aaaa89bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/aaaa89bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/aaaa89bf

Branch: refs/heads/feature/GEODE-1372
Commit: aaaa89bf4764f7b0656555bf3205bed0a1d199c0
Parents: 02b7688
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Wed May 11 08:40:28 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed May 11 13:14:25 2016 -0700

----------------------------------------------------------------------
 geode-assembly/build.gradle | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/aaaa89bf/geode-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index ed5154e..f6167c5 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -45,6 +45,7 @@ configurations {
   bundled {
     description 'A dependency that is shipped with geode, but is not required to compile'
   }
+  gfshDependencies
 }
 
 dependencies {
@@ -72,6 +73,11 @@ dependencies {
   testCompile 'org.apache.httpcomponents:httpcore:' + project.'httpcore.version'
 
   testRuntime files("${System.getProperty('java.home')}/../lib/tools.jar")
+
+  gfshDependencies ('org.springframework:spring-web:' + project.'springframework.version'){
+    exclude module: 'spring-core'
+    exclude module: 'commons-logging'
+  }
 }
 
 sourceSets {
@@ -188,13 +194,12 @@ task depsJar (type: Jar, dependsOn: ':geode-core:classes') {
 // a dependent project.  Please fix me.
 task gfshDepsJar (type: Jar, dependsOn: ':geode-core:classes') {
   description 'Assembles the jar archive that defines the gfsh classpath.'
-  def springWeb = configurations.runtime.collect { it.getName() }.find { it.contains('spring-web') }
   archiveName 'gfsh-dependencies.jar'
   doFirst {
     manifest {
       attributes("Class-Path": cp() + 
         ' ' + project(':geode-core').webJar.archiveName +
-        ' ' + springWeb
+        ' ' + configurations.gfshDependencies.collect{ it.getName() }.flatten().join(' ')
       )
     }
   }
@@ -325,6 +330,7 @@ distributions {
         from project(":geode-lucene").configurations.archives.allArtifacts.files
 
         from configurations.bundled
+        from configurations.gfshDependencies
 
         //These tasks are included as closures (wrapped in {}) because gradle may evaluate
         //this CopySpec before it evaluates the geode-core build file.