diff --git a/Jenkinsfile b/Jenkinsfile index 2c40755..a4ef77d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -369,7 +369,7 @@ def deployRelease(def categoryList, def yaml){ //def portlets="{\"generic_portlets\": "; // portlets += component_list?.collect{ return [ 'name': "$it.name", 'version': "$it.version", 'extension': 'war' ] } // portlets += component_list?.collect{ return " {\"group_id\": \"$it.group_id\", \"name\": \"$it.name\", \"version\": \"$it.version\", \"extension\": \"war\"} "} - portlets += component_list?.collect{ if ("${it.group_id}" != null) return "{\"group_id\": \"$it.group_id\", \"name\": \"$it.name\", \"version\": \"$it.version\", \"extension\": \"war\"} "; else return "{\"name\": \"$it.name\", \"version\": \"$it.version\", \"extension\": \"war\"}"} + portlets += component_list?.collect{ if ("${it.group_id}" != "null") return "{\"group_id\": \"$it.group_id\", \"name\": \"$it.name\", \"version\": \"$it.version\", \"extension\": \"war\"} "; else return "{\"name\": \"$it.name\", \"version\": \"$it.version\", \"extension\": \"war\"}"} // portlets.removeAll(["\"group_id\": \"null\""]); echo "portlets: $portlets" def jsonContent= "{\"generic_portlets\": "+portlets+"}"