You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/02/08 22:59:15 UTC
[48/50] [abbrv] incubator-geode git commit: GEODE-14: Include modules
as part of installDist task
GEODE-14: Include modules as part of installDist task
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f890a14d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f890a14d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f890a14d
Branch: refs/heads/feature/GEODE-773-2
Commit: f890a14d80393fff1532827eb313656a019e1221
Parents: 89b0ab2
Author: Jens Deppe <jd...@pivotal.io>
Authored: Thu Feb 4 18:44:05 2016 -0800
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Mon Feb 8 07:06:28 2016 -0800
----------------------------------------------------------------------
extensions/gemfire-modules-assembly/build.gradle | 16 +++++++++++-----
gemfire-assembly/build.gradle | 6 ++++++
2 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f890a14d/extensions/gemfire-modules-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/build.gradle b/extensions/gemfire-modules-assembly/build.gradle
index 8bfdde9..270e167 100644
--- a/extensions/gemfire-modules-assembly/build.gradle
+++ b/extensions/gemfire-modules-assembly/build.gradle
@@ -19,18 +19,14 @@ import org.apache.tools.ant.filters.ReplaceTokens
configurations {
slf4jDeps
-}
-
-configurations {
servletApiDeps
+ moduleDistOutputs
}
dependencies {
slf4jDeps 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
slf4jDeps 'org.slf4j:slf4j-jdk14:' + project.'slf4j-api.version'
-}
-dependencies {
servletApiDeps 'javax.servlet:servlet-api:2.5'
}
@@ -231,4 +227,14 @@ task distTcServer30(type: Zip, dependsOn: [':extensions/gemfire-modules:build',
configure(configureTcServer30Assembly)
}
+dependencies {
+ moduleDistOutputs distTcServer.outputs.files
+ moduleDistOutputs distTcServer30.outputs.files
+ moduleDistOutputs distHibernate.outputs.files
+ moduleDistOutputs distAppServer.outputs.files
+ moduleDistOutputs distTomcat.outputs.files
+}
+
task dist(type: Task, dependsOn: ['distTcServer', 'distTcServer30', 'distTomcat', 'distHibernate', 'distAppServer'])
+
+build.dependsOn dist
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f890a14d/gemfire-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-assembly/build.gradle b/gemfire-assembly/build.gradle
index 2d6cac9..c77d909 100755
--- a/gemfire-assembly/build.gradle
+++ b/gemfire-assembly/build.gradle
@@ -323,6 +323,10 @@ distributions {
exclude '*.jar'
}
}
+
+ into ('tools/Modules') {
+ from (project(':extensions/gemfire-modules-assembly').configurations.moduleDistOutputs.files)
+ }
}
}
}
@@ -341,3 +345,5 @@ integrationTest dependOnInstalledProduct
// Make build final task to generate all test and product resources
build.dependsOn installDist
+
+installDist.dependsOn ':extensions/gemfire-modules-assembly:dist'