This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new f31fd42 GEODE-5477 Fix distTomcat dependencies in geode assembly
(#2194)
f31fd42 is described below
commit f31fd4291b319b8ad3cb8084d63fcd97ea5fa6cf
Author: Robert Houghton <[email protected]>
AuthorDate: Wed Jul 25 18:13:43 2018 -0700
GEODE-5477 Fix distTomcat dependencies in geode assembly (#2194)
Task depends on jars for tomcat7 and tomcat8, but did not wait for those
tasks to execute.
Co-authored-by: Finn Southerland <[email protected]>
---
extensions/geode-modules-assembly/build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/extensions/geode-modules-assembly/build.gradle
b/extensions/geode-modules-assembly/build.gradle
index ff12c9d..10a427a 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -147,7 +147,7 @@ def configureTcServer30Assembly = {
}
}
-task distTomcat(type: Zip, dependsOn: ':extensions/geode-modules:assemble') {
+task distTomcat(type: Zip, dependsOn: [':extensions/geode-modules:jar',
':extensions/geode-modules-tomcat7:jar',
':extensions/geode-modules-tomcat8:jar']) {
baseName = moduleBaseName
classifier = "Tomcat"
@@ -171,7 +171,7 @@ task distTomcat(type: Zip, dependsOn:
':extensions/geode-modules:assemble') {
}
}
-task distAppServer(type: Zip, dependsOn:
':extensions/geode-modules-session:assemble') {
+task distAppServer(type: Zip, dependsOn:
[':extensions/geode-modules-session:jar',
':extensions/geode-modules-tomcat7:jar',
':extensions/geode-modules-tomcat8:jar']) {
baseName = moduleBaseName
classifier = "AppServer"
