[incubator-plc4x] branch master updated: - Merged the changes of develop back in order to prevent master from deploying SNAPSHOT versions.

[cd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git


The following commit(s) were added to refs/heads/master by this push:
     new 9e8acda  - Merged the changes of develop back in order to prevent master from deploying SNAPSHOT versions.
9e8acda is described below

commit 9e8acda909f9d2bf576fc183bc5997fe2b842106
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Nov 14 13:54:52 2018 +0100

    - Merged the changes of develop back in order to prevent master from deploying SNAPSHOT versions.
---
 Jenkinsfile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7fe71db..fcfb0ed 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
 
         PLC4X_BUILD_ON_JENKINS = true
         JENKINS_PROFILE = 'jenkins-build'
-        // On non master build we don't want to pollute the global m2 repo
+        // On non develop build we don't want to pollute the global m2 repo
         MVN_LOCAL_REPO_OPT = '-Dmaven.repo.local=.repository'
         // Testfails will be handled by the jenkins junit steps and mark the build as unstable.
         MVN_TEST_FAIL_IGNORE = '-Dmaven.test.failure.ignore=true'
@@ -77,7 +77,7 @@ pipeline {
         stage('Build') {
             when {
                 expression {
-                    env.BRANCH_NAME != 'master'
+                    env.BRANCH_NAME != 'develop'
                 }
             }
             steps {
@@ -92,9 +92,9 @@ pipeline {
             }
         }
 
-        stage('Build master') {
+        stage('Build develop') {
             when {
-                branch 'master'
+                branch 'develop'
             }
             steps {
                 echo 'Building'
@@ -119,7 +119,7 @@ pipeline {
         // Disabled till auth issues are resolved on infra.
         stage('Code Quality') {
             when {
-                branch 'master'
+                branch 'develop'
             }
             // Only the official build nodes have the credentials to deploy setup.
             /*agent {
@@ -137,7 +137,7 @@ pipeline {
 
         stage('Deploy') {
             when {
-                branch 'master'
+                branch 'develop'
             }
             // Only the official build nodes have the credentials to deploy setup.
             agent {
@@ -157,7 +157,7 @@ pipeline {
 
         stage('Build site') {
             when {
-                branch 'master'
+                branch 'develop'
             }
             steps {
                 echo 'Building Site'
@@ -167,7 +167,7 @@ pipeline {
 
         stage('Stage site') {
             when {
-                branch 'master'
+                branch 'develop'
             }
             steps {
                 echo 'Staging Site'
@@ -179,7 +179,7 @@ pipeline {
 
         stage('Deploy site') {
             when {
-                branch 'master'
+                branch 'develop'
             }
             // Only the nodes labeled 'git-websites' have the credentials to commit to the.
             agent {