From 366f0894e6ddfdd4321cc40cdd4dcd46499a97fe Mon Sep 17 00:00:00 2001
From: Anthony Baker <abaker@apache.org>
Date: Mon, 7 Nov 2016 20:01:07 -0800
Subject: [PATCH] GEODE-2078: Fix manifest classpath

The manifest classpath for *-dependencies.jar was pulling in
dependencies from geode-pulse and geode-web-api. Filter out those
projects before collecting the jars.
---
 geode-assembly/build.gradle | 92 +++++++++++++++++++------------------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index cc2518b834fe..d255b4c8cb75 100644
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -126,56 +126,58 @@ task defaultCacheConfig(type: JavaExec, dependsOn: classes) {
 def cp = {
   // first add all the dependent project jars
   def jars = configurations.archives.dependencies.collect { it.dependencyProject }
-    .findAll { !it.name.contains('web') }
+    .findAll { !(it.name.contains('web') || it.name.contains('pulse')) }
     .collect { it.jar.archiveName }
     .join(' ')
 
   // then add all the dependencies of the dependent jars
   jars += ' ' + configurations.archives.dependencies.collect { 
-    it.dependencyProject.configurations.runtime.collect { it.getName() }.findAll {
-      // depedencies from geode-core
-      it.contains('antlr') ||
-      it.contains('commons-io') ||
-      it.contains('commons-lang') ||
-      it.contains('commons-logging') ||
-      it.contains('fastutil') ||
-      it.contains('jackson-annotations') ||
-      it.contains('jackson-core') ||
-      it.contains('jackson-databind') ||
-      it.contains('jansi') ||
-      it.contains('javax.resource-api') ||
-      it.contains('javax.servlet-api') ||
-      it.contains('javax.transaction-api') ||
-      it.contains('jetty-http') ||
-      it.contains('jetty-io') ||
-      it.contains('jetty-security') ||
-      it.contains('jetty-server') ||
-      it.contains('jetty-servlet') ||
-      it.contains('jetty-webapp') ||
-      it.contains('jetty-util') ||
-      it.contains('jetty-xml') ||
-      it.contains('jline') ||
-      it.contains('jna') ||
-      it.contains('jopt-simple') ||
-      it.contains('log4j-api') ||
-      it.contains('log4j-core') ||
-      it.contains('log4j-jcl') ||
-      it.contains('log4j-jul') ||
-      it.contains('log4j-slf4j-impl') ||
-      it.contains('shiro') ||
-      it.contains('slf4j-api') ||
-      it.contains('spring-core') ||
-      it.contains('spring-shell') ||
-      it.contains('snappy') ||
-      it.contains('hbase') ||
-      it.contains('jgroups') ||
-      it.contains('netty') ||
-      
-      // dependencies from geode-lucene
-      it.contains('lucene-analyzers-common') ||
-      it.contains('lucene-core') ||
-      it.contains('lucene-queries') ||
-      it.contains('lucene-queryparser')
+    it.dependencyProject.findAll { !(it.name.contains('web-api') || it.name.contains('pulse')) }
+      .collect { it.configurations.runtime.collect { it.getName() }.findAll {
+        // depedencies from geode-core
+        it.contains('antlr') ||
+        it.contains('commons-io') ||
+        it.contains('commons-lang') ||
+        it.contains('commons-logging') ||
+        it.contains('fastutil') ||
+        it.contains('jackson-annotations') ||
+        it.contains('jackson-core') ||
+        it.contains('jackson-databind') ||
+        it.contains('jansi') ||
+        it.contains('javax.resource-api') ||
+        it.contains('javax.servlet-api') ||
+        it.contains('javax.transaction-api') ||
+        it.contains('jetty-http') ||
+        it.contains('jetty-io') ||
+        it.contains('jetty-security') ||
+        it.contains('jetty-server') ||
+        it.contains('jetty-servlet') ||
+        it.contains('jetty-webapp') ||
+        it.contains('jetty-util') ||
+        it.contains('jetty-xml') ||
+        it.contains('jline') ||
+        it.contains('jna') ||
+        it.contains('jopt-simple') ||
+        it.contains('log4j-api') ||
+        it.contains('log4j-core') ||
+        it.contains('log4j-jcl') ||
+        it.contains('log4j-jul') ||
+        it.contains('log4j-slf4j-impl') ||
+        it.contains('shiro') ||
+        it.contains('slf4j-api') ||
+        it.contains('spring-core') ||
+        it.contains('spring-shell') ||
+        it.contains('snappy') ||
+        it.contains('hbase') ||
+        it.contains('jgroups') ||
+        it.contains('netty') ||
+
+        // dependencies from geode-lucene
+        it.contains('lucene-analyzers-common') ||
+        it.contains('lucene-core') ||
+        it.contains('lucene-queries') ||
+        it.contains('lucene-queryparser')
+      }
     }
   }.flatten().unique().join(' ')