Skip to content

Commit fa3468c

Browse files
committed
Revert back the local ES build gradle changes.
1 parent 9b0b557 commit fa3468c

File tree

2 files changed

+6
-28
lines changed

2 files changed

+6
-28
lines changed

build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ task buildElasticsearchLocalDistro(dependsOn: unzipDownloadedElasticsearchSource
221221
errorOutput = funneler.funnelInstance
222222
}
223223

224-
def esSource = "/Users/mashhur/Dev/elastic/elasticsearch/"
224+
def esSource = "${buildDir}/elasticsearch-source/"
225225
def esBuildDir = "${esSource}/build"
226226

227227
inputs.dir esSource
@@ -261,7 +261,6 @@ task buildElasticsearchLogstashBridge(type: Exec) {
261261
description "builds logstash-bridge lib module"
262262

263263
dependsOn buildElasticsearchLocalDistro
264-
mustRunAfter buildElasticsearchLocalDistro
265264

266265
def logFile = project.file("${buildDir}/logstash-bridge-build.log")
267266
doFirst {
@@ -270,7 +269,7 @@ task buildElasticsearchLogstashBridge(type: Exec) {
270269
errorOutput = funneler.funnelInstance
271270
}
272271

273-
def esSource = "/Users/mashhur/Dev/elastic/elasticsearch/"
272+
def esSource = "${buildDir}/elasticsearch-source/"
274273
def esBuildDir = "${esSource}/build"
275274

276275
inputs.dir esSource
@@ -359,14 +358,14 @@ task shadeElasticsearchLogstashBridge(type: com.github.jengelman.gradle.plugins.
359358
description "Shades the Elasticsearch logstash-bridge jar"
360359

361360
dependsOn buildElasticsearchLogstashBridge
362-
363-
from("/Users/mashhur/Dev/elastic/elasticsearch/libs/logstash-bridge/build/distributions") {
361+
362+
from("${buildDir}/elasticsearch-source/libs/logstash-bridge/build/distributions") {
364363
include "elasticsearch-logstash-bridge-*.jar"
365364
}
366-
365+
367366
archiveFileName = "elasticsearch-logstash-bridge-shaded.jar"
368367
destinationDirectory = file("${buildDir}/shaded")
369-
368+
370369
exclude '**/module-info.class'
371370
}
372371

src/main/java/co/elastic/logstash/filters/elasticintegration/util/PluginProjectResolver.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)