Repository: incubator-geode Updated Branches: refs/heads/develop e9c571692 -> 366f0894e
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. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/366f0894 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/366f0894 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/366f0894 Branch: refs/heads/develop Commit: 366f0894e6ddfdd4321cc40cdd4dcd46499a97fe Parents: e9c5716 Author: Anthony Baker <aba...@apache.org> Authored: Mon Nov 7 20:01:07 2016 -0800 Committer: Anthony Baker <aba...@apache.org> Committed: Sat Nov 12 09:46:31 2016 -0800 ---------------------------------------------------------------------- geode-assembly/build.gradle | 92 ++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/366f0894/geode-assembly/build.gradle ---------------------------------------------------------------------- diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle index cc2518b..d255b4c 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(' ')
