Refactor: Cleanup for pre-commit

Change-Id: I322d72428f094f75f065d02f179a71958f36c875
Issue-ID: CIMAN-33
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>

15 files changed, 680 insertions, 683 deletions

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 2363bc136..08a35aceb 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -7,45 +7,45 @@
 
 - project:
     name: policy-apex-pdp
-    project-name: 'policy-apex-pdp'
+    project-name: "policy-apex-pdp"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: "-P docker"
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-P docker"
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/apex-pdp'
+    project: "policy/apex-pdp"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-apex-pdp-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-apex-pdp-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
@@ -53,30 +53,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/apex-pdp'
-    project-name: 'policy-apex-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-apex-pdp-settings'
+    project: "policy/apex-pdp"
+    project-name: "policy-apex-pdp"
+    branch: "master"
+    mvn-settings: "policy-apex-pdp-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-apex-pdp-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/apex-pdp
-    project-name: 'policy-apex-pdp'
+    project-name: "policy-apex-pdp"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-apex-pdp-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-apex-pdp-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index ad11393e4..8e6b5c0a6 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -1,45 +1,45 @@
 ---
 - project:
     name: policy-api
-    project-name: 'policy-api'
+    project-name: "policy-api"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/api'
+    project: "policy/api"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-api-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-api-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -47,30 +47,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/api'
-    project-name: 'policy-api'
-    branch: 'master'
-    mvn-settings: 'policy-api-settings'
+    project: "policy/api"
+    project-name: "policy-api"
+    branch: "master"
+    mvn-settings: "policy-api-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-api-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/api
-    project-name: 'policy-api'
+    project-name: "policy-api"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-api-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-api-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index 75b32d74e..95f9f000b 100644
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -1,46 +1,46 @@
 ---
 - project:
     name: policy-clamp
-    project-name: 'policy-clamp'
+    project-name: "policy-clamp"
     jobs:
       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
           sbom-generator: true
           maven-versions-plugin: true
           sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
-      - '{project-name}-{stream}-verify-java':
-          mvn-params: '-P docker'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -P docker"
+      - "{project-name}-{stream}-verify-java":
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-16g
-      - '{project-name}-{stream}-merge-java':
+      - "{project-name}-{stream}-merge-java":
           build-node: ubuntu1804-docker-8c-16g
-          mvn-params: '-P docker'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/clamp'
+    project: "policy/clamp"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-clamp-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-clamp-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
@@ -48,30 +48,30 @@
     jobs:
       - gerrit-maven-sonar:
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'policy/clamp'
-    project-name: 'policy-clamp'
-    branch: 'master'
-    mvn-settings: 'policy-clamp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "policy/clamp"
+    project-name: "policy-clamp"
+    branch: "master"
+    mvn-settings: "policy-clamp-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
     java-version: openjdk11
 
 - project:
     name: policy-clamp-clm
     jobs:
       - gerrit-maven-clm:
-    nexus-iq-namespace: 'onap-'
-    project: 'policy/clamp'
-    project-name: 'policy-clamp'
+    nexus-iq-namespace: "onap-"
+    project: "policy/clamp"
+    project-name: "policy-clamp"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-clamp-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-clamp-settings"
     build-node: ubuntu1804-docker-8c-8g
     java-version: openjdk11
 
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 222031d67..27f47585e 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -1,35 +1,35 @@
 ---
 - project:
     name: policy-common
-    project-name: 'policy-common'
+    project-name: "policy-common"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-Dmaven.test.skip=true"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/common'
+    project: "policy/common"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-common-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-common-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -37,30 +37,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/common'
-    project-name: 'policy-common'
-    branch: 'master'
-    mvn-settings: 'policy-common-settings'
+    project: "policy/common"
+    project-name: "policy-common"
+    branch: "master"
+    mvn-settings: "policy-common-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-common-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/common
-    project-name: 'policy-common'
+    project-name: "policy-common"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-common-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-common-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml
index 26d3e3e07..b42b40258 100644
--- a/jjb/policy/policy-csit-jobs.yaml
+++ b/jjb/policy/policy-csit-jobs.yaml
@@ -1,47 +1,48 @@
+---
 - job-template:
-    name: '{project-name}-{stream}-project-csit-{functionality}'
+    name: "{project-name}-{stream}-project-csit-{functionality}"
     disabled: false
     project-type: freestyle
-    build-node: 'ubuntu1804-docker-8c-8g'
-    node: '{build-node}'
-    recipients: ''
-    java-version: 'openjdk11'
+    build-node: "ubuntu1804-docker-8c-8g"
+    node: "{build-node}"
+    recipients: ""
+    java-version: "openjdk11"
     python-version: python3
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
-          build-days-to-keep: '{build-days-to-keep}'
+          project: "{project}"
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - integration-test-options:
-          test-options: '{functionality}'
+          test-options: "{functionality}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
 
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
-      - timed: '@daily'
+      - timed: "@daily"
       - reverse:
-          jobs: '{obj:trigger_jobs}'
+          jobs: "{obj:trigger_jobs}"
 
     builders:
       - lf-infra-pre-build
       - lf-update-java-alternatives:
-          java-version: '{java-version}'
+          java-version: "{java-version}"
       - integration-run-project-test
 
     publishers:
@@ -50,57 +51,57 @@
           pass-if: 100.0
       - lf-infra-publish
       - email:
-          recipients: '{recipients}'
+          recipients: "{recipients}"
           notify-every-unstable-build: false
           send-to-individuals: true
 
 - job-template:
-    name: '{project-name}-{stream}-project-csit-verify-{functionality}'
+    name: "{project-name}-{stream}-project-csit-verify-{functionality}"
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1804-docker-8c-8g'
-    node: '{build-node}'
-    recipients: ''
-    java-version: 'openjdk11'
+    build-node: "ubuntu1804-docker-8c-8g"
+    node: "{build-node}"
+    recipients: ""
+    java-version: "openjdk11"
     python-version: python3
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
-          build-days-to-keep: '{build-days-to-keep}'
+          project: "{project}"
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - integration-test-options:
-          test-options: '{functionality}'
+          test-options: "{functionality}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
+          submodule-recursive: "{submodule-recursive}"
 
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**/csit/**'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**/csit/**"
 
     builders:
       - lf-infra-pre-build
       - lf-update-java-alternatives:
-          java-version: '{java-version}'
+          java-version: "{java-version}"
       - integration-run-project-test
 
     publishers:
@@ -109,7 +110,6 @@
           pass-if: 100.0
       - lf-infra-publish
       - email:
-          recipients: '{recipients}'
+          recipients: "{recipients}"
           notify-every-unstable-build: false
           send-to-individuals: true
-
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 237c32208..ee84572d3 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -1,218 +1,219 @@
+---
 - project:
     name: policy-distribution-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-distribution'
-    recipients: 'ram_krishna.verma@bell.ca'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-distribution"
+    recipients: "ram_krishna.verma@bell.ca"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'distribution'
+      - "distribution"
     trigger_jobs:
-      - 'policy-distribution-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-distribution-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-xacml-pdp-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-xacml-pdp'
-    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-xacml-pdp"
+    recipients: "jrh3@att.com jorge.hernandez-herrero@att.com"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'xacml-pdp'
+      - "xacml-pdp"
     trigger_jobs:
-      - 'policy-xacml-pdp-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-xacml-pdp-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-drools-applications-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-drools-applications'
-    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-drools-applications"
+    recipients: "jrh3@att.com jorge.hernandez-herrero@att.com"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'drools-applications'
+      - "drools-applications"
     trigger_jobs:
-      - 'policy-drools-applications-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-drools-applications-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-drools-pdp-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-drools-pdp'
-    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-drools-pdp"
+    recipients: "jrh3@att.com jorge.hernandez-herrero@att.com"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'drools-pdp'
+      - "drools-pdp"
     trigger_jobs:
-      - 'policy-drools-pdp-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-drools-pdp-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-apex-pdp-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-apex-pdp'
-    recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-apex-pdp"
+    recipients: "liam.fallon@est.tech ram_krishna.verma@bell.ca"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'apex-pdp'
+      - "apex-pdp"
     trigger_jobs:
-      - 'policy-apex-pdp-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-apex-pdp-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-pap-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-pap'
-    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-pap"
+    recipients: "jrh3@att.com ram_krishna.verma@bell.ca"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'pap'
+      - "pap"
     trigger_jobs:
-      - 'policy-pap-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-pap-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-api-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-api'
-    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-api"
+    recipients: "jrh3@att.com ram_krishna.verma@bell.ca"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'api'
+      - "api"
     trigger_jobs:
-      - 'policy-api-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-api-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-clamp-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-clamp'
-    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-clamp"
+    recipients: "jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'clamp'
+      - "clamp"
     trigger_jobs:
-      - 'policy-clamp-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-clamp-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-apex-pdp-postgres-project-csit
     jobs:
-        - '{project-name}-{stream}-project-csit-verify-{functionality}'
-        - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-apex-pdp'
-    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-apex-pdp"
+    recipients: "jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com"
+    project: "policy/docker"
     stream:
-        - 'master':
-              branch: 'master'
-        - 'kohn':
-              branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     functionality:
-        - 'apex-pdp-postgres'
+      - "apex-pdp-postgres"
     trigger_jobs:
-        - 'policy-apex-pdp-{stream}-merge-java'
-        - 'policy-docker-{stream}-merge-java'
+      - "policy-apex-pdp-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index e91fef856..8b022f890 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -1,45 +1,45 @@
 ---
 - project:
     name: policy-distribution
-    project-name: 'policy-distribution'
+    project-name: "policy-distribution"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/distribution'
+    project: "policy/distribution"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-distribution-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-distribution-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -47,30 +47,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/distribution'
-    project-name: 'policy-distribution'
-    branch: 'master'
-    mvn-settings: 'policy-distribution-settings'
+    project: "policy/distribution"
+    project-name: "policy-distribution"
+    branch: "master"
+    mvn-settings: "policy-distribution-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-distribution-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/distribution
-    project-name: 'policy-distribution'
+    project-name: "policy-distribution"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-distribution-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-distribution-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index e26f0ec69..085b61ece 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -1,57 +1,54 @@
 ---
 - project:
     name: policy-docker-base-common
-    project-name: 'policy-docker'
+    project-name: "policy-docker"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
           mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    mvn-settings: 'policy-docker-settings'
+    mvn-settings: "policy-docker-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     java-version: openjdk11
 
-    project: 'policy/docker'
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-docker-settings'
-    mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
-    java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-docker-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/docker
-    project-name: 'policy-docker'
+    project-name: "policy-docker"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-docker-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-docker-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     java-version: openjdk11
 
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index ddc280021..1c4c669e9 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -1,82 +1,81 @@
 ---
 - project:
     name: policy-drools-applications
-    project-name: 'policy-drools-applications'
+    project-name: "policy-drools-applications"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
           mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker  -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker  -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/drools-applications'
+    project: "policy/drools-applications"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-drools-applications-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-drools-applications-settings"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
-
 - project:
     name: policy-drools-applications-sonar
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/drools-applications'
-    project-name: 'policy-drools-applications'
-    branch: 'master'
-    mvn-settings: 'policy-drools-applications-settings'
+    project: "policy/drools-applications"
+    project-name: "policy-drools-applications"
+    branch: "master"
+    mvn-settings: "policy-drools-applications-settings"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     java-version: openjdk11
-    java-opts: '-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-opts: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-drools-applications-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/drools-applications
-    project-name: 'policy-drools-applications'
+    project-name: "policy-drools-applications"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-drools-applications-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-drools-applications-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     mvn-version: "mvn36"
     maven-version: "mvn36"
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index bcdfe4916..46a348530 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -1,45 +1,45 @@
 ---
 - project:
     name: policy-drools-pdp
-    project-name: 'policy-drools-pdp'
+    project-name: "policy-drools-pdp"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
           mvn-params: "-P docker"
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker  -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker  -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/drools-pdp'
+    project: "policy/drools-pdp"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-drools-pdp-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-drools-pdp-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
@@ -47,31 +47,31 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/drools-pdp'
-    project-name: 'policy-drools-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-drools-pdp-settings'
+    project: "policy/drools-pdp"
+    project-name: "policy-drools-pdp"
+    branch: "master"
+    mvn-settings: "policy-drools-pdp-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-drools-pdp-clm
     jobs:
       - gerrit-maven-clm:
-          mvn-params: '-Dmaven.test.skip=true'
-    nexus-iq-namespace: 'onap-'
+          mvn-params: "-Dmaven.test.skip=true"
+    nexus-iq-namespace: "onap-"
     project: policy/drools-pdp
-    project-name: 'policy-drools-pdp'
+    project-name: "policy-drools-pdp"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-drools-pdp-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-drools-pdp-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index dab10cce7..128098283 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -1,43 +1,43 @@
 ---
 - project:
     name: policy-gui
-    project-name: 'policy-gui'
+    project-name: "policy-gui"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/gui'
+    project: "policy/gui"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-gui-settings'
+      - "master":
+          branch: "master"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-gui-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -45,31 +45,31 @@
     jobs:
       - gerrit-maven-sonar-prescan-script
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/gui'
-    project-name: 'policy-gui'
-    branch: 'master'
-    mvn-settings: 'policy-gui-settings'
+    project: "policy/gui"
+    project-name: "policy-gui"
+    branch: "master"
+    mvn-settings: "policy-gui-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
     sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
 
 - project:
     name: policy-gui-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/gui
-    project-name: 'policy-gui'
+    project-name: "policy-gui"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-gui-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-gui-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 7fd34eabd..46e254e6f 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -1,45 +1,45 @@
 ---
 - project:
     name: policy-models
-    project-name: 'policy-models'
+    project-name: "policy-models"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/models'
+    project: "policy/models"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-models-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-models-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -47,30 +47,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/models'
-    project-name: 'policy-models'
-    branch: 'master'
-    mvn-settings: 'policy-models-settings'
+    project: "policy/models"
+    project-name: "policy-models"
+    branch: "master"
+    mvn-settings: "policy-models-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-models-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/models
-    project-name: 'policy-models'
+    project-name: "policy-models"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-models-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-models-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 458619ad5..635f6bc07 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -1,45 +1,45 @@
 ---
 - project:
     name: policy-pap
-    project-name: 'policy-pap'
+    project-name: "policy-pap"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/pap'
+    project: "policy/pap"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-pap-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-pap-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -47,30 +47,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/pap'
-    project-name: 'policy-pap'
-    branch: 'master'
-    mvn-settings: 'policy-pap-settings'
+    project: "policy/pap"
+    project-name: "policy-pap"
+    branch: "master"
+    mvn-settings: "policy-pap-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-pap-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/pap
-    project-name: 'policy-pap'
+    project-name: "policy-pap"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-pap-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-pap-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 0ca036baa..ffd94856b 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -1,48 +1,48 @@
 ---
 - project:
     name: policy-parent
-    project-name: 'policy-parent'
+    project-name: "policy-parent"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-Dmaven.test.skip=true"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/parent'
+    project: "policy/parent"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-parent-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-parent-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-parent-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/parent
-    project-name: 'policy-parent'
+    project-name: "policy-parent"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-parent-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-parent-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index cce8a3bd9..a0a940d99 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -1,45 +1,45 @@
 ---
 - project:
     name: policy-xacml-pdp
-    project-name: 'policy-xacml-pdp'
+    project-name: "policy-xacml-pdp"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/xacml-pdp'
+    project: "policy/xacml-pdp"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-xacml-pdp-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-xacml-pdp-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -47,30 +47,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/xacml-pdp'
-    project-name: 'policy-xacml-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-xacml-pdp-settings'
+    project: "policy/xacml-pdp"
+    project-name: "policy-xacml-pdp"
+    branch: "master"
+    mvn-settings: "policy-xacml-pdp-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-xacml-pdp-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/xacml-pdp
-    project-name: 'policy-xacml-pdp'
+    project-name: "policy-xacml-pdp"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-xacml-pdp-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-xacml-pdp-settings"
     java-version: openjdk11
 
 - project: