honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing dependencies so we can build in parallel (#43672)

This commit is contained in:
Alpar Torok 2019-06-28 16:33:24 +03:00
parent 81dbcfb268
commit d1a4d8866d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distribution/build.gradle
View File

@ -117,7 +117,7 @@ task buildTransportModules {
void copyModule(Sync copyTask, Project module) {
copyTask.configure {
dependsOn { module.bundlePlugin }
dependsOn "${module.path}:bundlePlugin"
from({ zipTree(module.bundlePlugin.outputs.files.singleFile) }) {
includeEmptyDirs false
@ -167,6 +167,7 @@ buildDefaultLog4jConfig.doLast(writeLog4jProperties)
// copy log4j2.properties from modules that have it
void copyLog4jProperties(Task buildTask, Project module) {
buildTask.dependsOn "${module.path}:bundlePlugin"
buildTask.doFirst {
FileTree tree = zipTree(module.bundlePlugin.outputs.files.singleFile)
FileTree filtered = tree.matching {

4
x-pack/plugin/sql/sql-cli/build.gradle
View File

@ -51,9 +51,9 @@ dependencyLicenses {
* can be easily shipped around and used.
*/
jar {
dependsOn configurations.runtimeClasspath
from({
configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) }
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
}) {
// We don't need the META-INF from the things we bundle. For now.
exclude 'META-INF/*'