You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2015/11/24 20:34:03 UTC
incubator-geode git commit: GEODE-587: Improve classpath generation
Repository: incubator-geode
Updated Branches:
refs/heads/develop abad018a9 -> 3588b029a
GEODE-587: Improve classpath generation
Improve classpath generation for the *-dependencies jar files. All
dependent projects are now automatically analyzed for matching jar
names.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3588b029
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3588b029
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3588b029
Branch: refs/heads/develop
Commit: 3588b029a23c0dd4fd3576a7f25efe0c57581386
Parents: abad018
Author: Anthony Baker <ab...@pivotal.io>
Authored: Mon Nov 23 17:30:06 2015 -0800
Committer: Anthony Baker <ab...@pivotal.io>
Committed: Tue Nov 24 11:33:52 2015 -0800
----------------------------------------------------------------------
gemfire-assembly/build.gradle | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3588b029/gemfire-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-assembly/build.gradle b/gemfire-assembly/build.gradle
index 8f803ae..1324cb9 100755
--- a/gemfire-assembly/build.gradle
+++ b/gemfire-assembly/build.gradle
@@ -74,13 +74,16 @@ task defaultCacheConfig(type: JavaExec, dependsOn: classes) {
// This closure sets the gemfire classpath. If we add another jar to the classpath it must
// be included in the filter logic below.
def cp = {
+ // first add all the dependent project jars
def jars = configurations.archives.dependencies.collect { it.dependencyProject }
.findAll { !it.name.contains('web') }
.collect { it.jar.archiveName }
.join(' ')
- jars += ' ' +
- project(':gemfire-core').configurations.runtime.collect { it.getName() }.findAll {
+ // then add all the dependencies of the dependent jars
+ jars += ' ' + configurations.archives.dependencies.collect {
+ it.dependencyProject.configurations.runtime.collect { it.getName() }.findAll {
+ // depedencies from gemfire-core
it.contains('antlr') ||
it.contains('commons-io') ||
it.contains('commons-logging') ||
@@ -113,17 +116,16 @@ def cp = {
it.contains('snappy-java') ||
it.contains('hbase') ||
it.contains('jgroups') ||
- it.contains('netty')
- }.join(' ')
-
- jars += ' ' +
- project(':gemfire-lucene').configurations.runtime.collect { it.getName() }.findAll {
+ it.contains('netty') ||
+
+ // dependencies from gemfire-lucene
it.contains('lucene-analyzers-common') ||
it.contains('lucene-core') ||
it.contains('lucene-queries') ||
it.contains('lucene-queryparser')
- }.join(' ')
-
+ }
+ }.flatten().unique().join(' ')
+
return jars
}