You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/05/22 14:31:55 UTC

[plc4x] 02/02: - Moved the disabling of the java9-and-above profile to another step in the build

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 8c368a0764a37a354b80f82dc1075fd2a822d3ae
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri May 22 16:31:46 2020 +0200

    - Moved the disabling of the java9-and-above profile to another step in the build
---
 Jenkinsfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c46b32a..729dd37 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -173,7 +173,10 @@ pipeline {
             steps {
                 echo 'Building Site'
                 //sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-proxies,with-logstash site'
-                sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-logstash site -pl .'
+                // Explicitly deselecting the "_allow_illegal_access_reflection_in_tests"
+                // profile as there seem to be problems on the site building node to detect the java version.
+                // In this case we don't really care as no unit- or integration-tests are being executed.
+                sh 'mvn -P${JENKINS_PROFILE},skip-prerequisite-check,with-logstash,!_allow_illegal_access_reflection_in_tests site -pl .'
             }
         }
 
@@ -215,10 +218,7 @@ pipeline {
                 // Unstash the previously stashed site.
                 unstash 'plc4x-site'
                 // Publish the site with the scm-publish plugin.
-                // Explicitly deselecting the "_allow_illegal_access_reflection_in_tests"
-                // profile as there seem to be problems on the site building node to detect the java version.
-                // In this case we don't really care as no unit- or integration-tests are being executed.
-                sh 'mvn -f jenkins.pom -X -P deploy-site,!_allow_illegal_access_reflection_in_tests scm-publish:publish-scm'
+                sh 'mvn -f jenkins.pom -X -P deploy-site scm-publish:publish-scm'
 
                 // Clean up the snapshots directory (freeing up more space after deploying).
                 dir("target/staging") {