From 4fba5cc17bdec5765be2d84b474aa62a3bdbf29b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 29 Jan 2021 12:06:17 +0100
Subject: [PATCH] Fix Jenkinsfile

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f27f382daa..dd6e063b98 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
       }
       steps {
         // read version from branch, set it and commit it
-        gradle "setVersion -PnewVersion ${releaseVersion}"
+        gradle "setVersion -PnewVersion=${releaseVersion}"
         sh "git add gradle.properties lerna.json '**.json'"
         commit "Release version ${releaseVersion}"
 
@@ -138,7 +138,7 @@ pipeline {
       steps {
         sh returnStatus: true, script: "git branch -D develop"
         sh "git checkout develop"
-        sh "git merge master"
+        sh "git -c user.name='CES Marvin' -c user.email='cesmarvin@cloudogu.com' merge master"
 
         gradle "setVersionToNextSnapshot"