Merge branch 'master' into AMATERASU-36-mesos
diff --git a/build.gradle b/build.gradle
index dc5aa95..85fa08b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,7 +52,9 @@
}
task buildHomeDir() {
- dependsOn subprojects.collect { getTasksByName('copyToHome', true) }
+ dependsOn subprojects.collect {
+ getTasksByName('copyToHome', true)
+ }
dependsOn copyLegalFiles
}
diff --git a/frameworks/spark/runtime/build.gradle b/frameworks/spark/runtime/build.gradle
index b0c3362..1f2659d 100644
--- a/frameworks/spark/runtime/build.gradle
+++ b/frameworks/spark/runtime/build.gradle
@@ -76,12 +76,12 @@
}
test {
-
maxParallelForks = 1
}
task copyToHome(type: Copy) {
dependsOn shadowJar
+
from 'build/libs'
into '../../../build/amaterasu/dist'
from 'build/resources/main'