From fbf75ba580bab46b41a348d277e8049b33a0159c Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 8 Feb 2021 13:21:28 +0100
Subject: [PATCH] Fix conflict between property and task name

---
 Jenkinsfile     | 2 +-
 README.md       | 6 +++---
 settings.gradle | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index cc37dac2cc..2ad2f79321 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -96,7 +96,7 @@ pipeline {
       }
       steps {
         withPublishEnivronment {
-          gradle "-Pdistribution publish"
+          gradle "-PenablePackaging publish"
         }
       }
     }
diff --git a/README.md b/README.md
index a45016398c..c135eec534 100644
--- a/README.md
+++ b/README.md
@@ -111,14 +111,14 @@ If you want to wait until a debugger is attached, before SCM-Manager starts you
 
 SCM-Manager provides various modules to deploy SCM-Manager on differnt platforms (e.g. Docker, Helm, RPM, DEB, Windows).
 Those modules are not build by default. 
-To build the distribution modules specify the `distribution` property e.g.:
+To build the distribution modules specify the `enablePackaging` property e.g.:
 
 ```bash
 # on unix
-./gradlew -Pdistribution distribution
+./gradlew -PenablePackaging distribution
 
 # on windows
-gradlew.bat -Pdistribution distribution
+gradlew.bat -PenablePackaging distribution
 ```
 
 ### Properties for publishing
diff --git a/settings.gradle b/settings.gradle
index e34f3d7b6b..494e070222 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -70,8 +70,8 @@ include 'scm-it'
 
 // Do not add scm-packaging modules to every build,
 // These modules drastically increase the time Gradle spends in the configuration phase.
-// To build a distribution of SCM-Manager you have to pass -Pdistribution
-if (settings.hasProperty("distribution")) {
+// To build a distribution of SCM-Manager you have to pass -PenablePackaging
+if (settings.hasProperty("enablePackaging")) {
   include 'scm-packaging:unix'
   include 'scm-packaging:windows'
   include 'scm-packaging:deb'