Skip to content

Commit

Permalink
GEODE-2078: Fix manifest classpath
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
metatype committed Nov 12, 2016
1 parent e9c5716 commit 366f089
Showing 1 changed file with 47 additions and 45 deletions.
92 changes: 47 additions & 45 deletions geode-assembly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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(' ')

Expand Down

0 comments on commit 366f089

Please sign in to comment.