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
The following commit(s) were added to refs/heads/develop by this push:
new ff3bba9 - Moved the logstash-plugin into the "with-logstash" profile.
This can be removed (as well as the logstash-core module in tools) as soon as
the logstash core modules are deployed to maven-central.
ff3bba9 is described below
commit ff3bba9eaf110a7f8e14f6d25dceb4c556ce0c97
Author: Christofer Dutz <[email protected]>
AuthorDate: Tue Aug 27 16:11:15 2019 +0200
- Moved the logstash-plugin into the "with-logstash" profile. This can be
removed (as well as the logstash-core module in tools) as soon as the logstash
core modules are deployed to maven-central.
---
Jenkinsfile | 10 +++++-----
plc4j/integrations/pom.xml | 10 +++++++++-
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 408dc88..75bb35b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -85,7 +85,7 @@ pipeline {
}
steps {
echo 'Building'
- sh 'mvn
-P${JENKINS_PROFILE},development,with-boost,with-cpp,with-java,with-dotnet,with-python,with-proxies,with-sandbox
${MVN_TEST_FAIL_IGNORE} ${MVN_LOCAL_REPO_OPT} clean install'
+ sh 'mvn
-P${JENKINS_PROFILE},development,with-boost,with-cpp,with-java,with-dotnet,with-python,with-proxies,with-sandbox,with-logstash
${MVN_TEST_FAIL_IGNORE} ${MVN_LOCAL_REPO_OPT} clean install'
}
post {
always {
@@ -108,7 +108,7 @@ pipeline {
// We'll deploy to a relative directory so we can save
// that and deploy in a later step on a different node
- sh 'mvn -U
-P${JENKINS_PROFILE},development,with-boost,with-java,with-dotnet,with-cpp,with-python,with-proxies,with-sandbox
${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION}
-DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir
clean deploy'
+ sh 'mvn -U
-P${JENKINS_PROFILE},development,with-boost,with-java,with-dotnet,with-cpp,with-python,with-proxies,with-sandbox,with-logstash
${MVN_TEST_FAIL_IGNORE} ${JQASSISTANT_NEO4J_VERSION}
-DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir
clean deploy'
// Stash the build results so we can deploy them on another
node
stash name: 'plc4x-build-snapshots', includes:
'local-snapshots-dir/**'
@@ -128,7 +128,7 @@ pipeline {
steps {
echo 'Checking Code Quality on SonarCloud'
withCredentials([string(credentialsId:
'chris-sonarcloud-token', variable: 'SONAR_TOKEN')]) {
- sh 'mvn
-P${JENKINS_PROFILE},with-boost,with-java,with-dotnet,with-python,with-proxies
sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.login=${SONAR_TOKEN}'
+ sh 'mvn
-P${JENKINS_PROFILE},with-boost,with-java,with-dotnet,with-cpp,with-python,with-proxies,with-sandbox,with-logstash
sonar:sonar ${SONARCLOUD_PARAMS} -Dsonar.login=${SONAR_TOKEN}'
}
}
}
@@ -169,7 +169,7 @@ pipeline {
}
steps {
echo 'Building Site'
- sh 'mvn
-P${JENKINS_PROFILE},with-boost,with-java,with-dotnet,with-python,with-proxies
site'
+ sh 'mvn
-P${JENKINS_PROFILE},with-java,with-proxies,with-logstash site'
}
}
@@ -180,7 +180,7 @@ pipeline {
steps {
echo 'Staging Site'
// Build a directory containing the aggregated website.
- sh 'mvn
-P${JENKINS_PROFILE},with-boost,with-java,with-dotnet,with-python,with-proxies
site:stage'
+ sh 'mvn
-P${JENKINS_PROFILE},with-java,with-proxies,with-logstash site:stage'
// Make sure the script is executable.
sh 'chmod +x tools/clean-site.sh'
// Remove some redundant resources, which shouldn't be
required.
diff --git a/plc4j/integrations/pom.xml b/plc4j/integrations/pom.xml
index f35b5d3..f2ba6d0 100644
--- a/plc4j/integrations/pom.xml
+++ b/plc4j/integrations/pom.xml
@@ -39,7 +39,15 @@
<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
