Fix PackageBuildOutputs.groovy from overriding activated settings via by properties file (#273)

* Fix PackageBuildOutputs.groovy from overriding activated settings via by properties file

Signed-off-by: Dennis Behm <dennis.behm@de.ibm.com>

Author: dennis-behm

Pipeline/PackageBuildOutputs/PackageBuildOutputs.groovy

@@ -703,18 +703,19 @@ def parseInput(String[] cliArgs){
 	if (opts.a) props.application = opts.a
 	if (opts.b) props.branch = opts.b
 
-	props.generateWaziDeployAppManifest = (opts.wd) ? 'true' : false
-	
-	props.addExtension = (opts.ae) ? 'true' : 'false'
+	// cli overrides defaults set in 'packageBuildOutputs.properties'
+	props.generateWaziDeployAppManifest = (opts.wd) ? 'true' : props.generateWaziDeployAppManifest
+	props.addExtension = (opts.ae) ? 'true' : props.addExtension
+	props.publish = (opts.p) ? 'true' : props.publish
+	props.generateSBOM = (opts.sbom) ? 'true' : props.generateSBOM
+
 	props.verbose = (opts.verb) ? 'true' : 'false'
 
 	// default log encoding if not specified via config passed in via --properties
 	if (!props.fileEncoding) props.fileEncoding = "IBM-1047"
 
 	// Optional Artifact repository info to deploy package
-
 	if (opts.v) props.versionName = opts.v
-	props.publish = (opts.p) ? 'true' : 'false'
 
 	// read of artifact repository file
 	if (opts.aprop) {
@@ -763,7 +764,6 @@ def parseInput(String[] cliArgs){
 	}
 	props.buildReportOrder = buildReports
 
-	props.generateSBOM = (opts.sbom) ? 'true' : 'false'
 	if (opts.sbomAuthor) {
 		props.sbomAuthor = opts.sbomAuthor
 	}    

Pipeline/PackageBuildOutputs/packageBuildOutputs.properties

@@ -30,6 +30,18 @@ addExtension=false
 #  Default: false
 generateWaziDeployAppManifest=false
 
+# Boolean setting to define if SBOM based on cycloneDX should be generated
+#  Please note that the cli option `generateSBOM` can override this setting and activate it.
+#  Requires the classpath to contain the cycloneDX libs
+#  Default: false
+generateSBOM=false
+
+# Boolean setting to define if the ArtifactPublisherHelpers should be invoked to upload the package to the configured
+#  binary artifact repository, see appArtifactRepository.properties (--artifactRepositoryPropertyFile) or the individual configurations
+#  Please note that the cli option `publish` can override this setting and activate it.
+#  Default: false
+publish=false
+
 # Name of the default tarFileName
 #  When processing a single build report, the DBB Build report label it used as the tar file name
 #  When processing multiple build report, 'Default' is used as the tar file name