This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 5e5685b39ed15f388a80ac99fd15d6a229e4a770 Author: Christofer Dutz <[email protected]> AuthorDate: Thu Aug 22 10:06:00 2019 +0200 - Removed the "with-logstash" profile - Removed the gem checks in the prerequisiteChack.groovy --- plc4j/integrations/pom.xml | 10 +--------- src/main/script/prerequisiteCheck.groovy | 24 ------------------------ 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/plc4j/integrations/pom.xml b/plc4j/integrations/pom.xml index f2ba6d0..f35b5d3 100644 --- a/plc4j/integrations/pom.xml +++ b/plc4j/integrations/pom.xml @@ -39,15 +39,7 @@ <module>apache-nifi</module> <module>apache-karaf</module> <module>apache-calcite</module> + <module>logstash-plugin</module> </modules> - <profiles> - <profile> - <id>with-logstash</id> - <modules> - <module>logstash-plugin</module> - </modules> - </profile> - </profiles> - </project> \ No newline at end of file diff --git a/src/main/script/prerequisiteCheck.groovy b/src/main/script/prerequisiteCheck.groovy index 7247be7..72a1558 100644 --- a/src/main/script/prerequisiteCheck.groovy +++ b/src/main/script/prerequisiteCheck.groovy @@ -146,22 +146,6 @@ def checkGpp() { } } -/*def checkGem() { - print "Detecting Gem version: " - def output = "gem --version".execute().text - Matcher matcher = extractVersion(output) - if(matcher.size() > 0) { - def curVersion = matcher[0][1] - def result = checkVersionAtLeast(curVersion, "3.0.0") - if(!result) { - allConditionsMet = false - } - } else { - println "missing" - allConditionsMet = false - } -}*/ - def checkPython() { print "Detecting Python version: " def process = ("python --version").execute() @@ -257,7 +241,6 @@ def javaEnabled = false def pythonEnabled = false def proxiesEnabled = false def sandboxEnabled = false -def logstashEnabled = false def activeProfiles = session.request.activeProfiles for (def activeProfile : activeProfiles) { if(activeProfile == "with-boost") { @@ -281,9 +264,6 @@ for (def activeProfile : activeProfiles) { } else if(activeProfile == "with-sandbox") { sandboxEnabled = true println "sandbox" - } else if(activeProfile == "with-logstash") { - logstashEnabled = true - println "logstash" } } println "" @@ -343,10 +323,6 @@ if(!boostEnabled && cppEnabled) { checkBoost() } -/*if(javaEnabled && logstashEnabled) { - checkGem() -}*/ - if(!allConditionsMet) { throw new RuntimeException("Not all conditions met, see log for details.") }
