15 files changed, 574 insertions, 352 deletions
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 9dd5957ec..62b6ed76b 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -6,7 +6,7 @@
       - project-view
 
 - project:
-    name: policy-apex-pdp
+    name: policy-apex-pdp-java-17
     project-name: "policy-apex-pdp"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -34,14 +34,43 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
+      - "montreal":
+          branch: "montreal"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-apex-pdp-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-8c-8g
+
+- 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"
+      - 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"
+      - 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":
+          build-node: centos7-docker-2c-1g
+
+    project: "policy/apex-pdp"
+    stream:
       - "london":
           branch: "london"
     mvn-settings: "policy-apex-pdp-settings"
@@ -58,15 +87,15 @@
     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-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-apex-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-apex-pdp-clm
@@ -78,14 +107,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-apex-pdp-settings"
-    java-version: openjdk11
-
-- project:
-    name: policy-apex-pdp-info
-    project-name: policy-apex-pdp
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: policy/apex-pdp
-    branch: master
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    java-version: openjdk17
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 2a3641d44..a1a6c15f2 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-api
+    name: policy-api-java-17
     project-name: "policy-api"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -28,14 +28,43 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
+      - "montreal":
+          branch: "montreal"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-api-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: policy-api-java11
+    project-name: "policy-api"
+    jobs:
+      - "{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"
+      - 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":
+          build-node: centos7-docker-2c-1g
+
+    project: "policy/api"
+    stream:
       - "london":
           branch: "london"
     mvn-settings: "policy-api-settings"
@@ -52,15 +81,15 @@
     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"
-    java-version: openjdk11
+    java-version: openjdk17
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-api-clm
@@ -72,14 +101,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-api-settings"
-    java-version: openjdk11
-
-- project:
-    name: policy-api-info
-    project-name: policy-api
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: policy/api
-    branch: master
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    java-version: openjdk17
diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index 74f403e0c..b4d885c8b 100644
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-clamp
+    name: policy-clamp-java-17
     project-name: "policy-clamp"
     jobs:
       - gerrit-maven-stage:
@@ -17,7 +17,6 @@
           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":
           build-node: ubuntu1804-docker-8c-16g
@@ -29,14 +28,44 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
+      - "montreal":
+          branch: "montreal"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-clamp-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
+    name: policy-clamp-java11
+    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"
+      - 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"
+          build-node: ubuntu1804-docker-8c-16g
+      - "{project-name}-{stream}-merge-java":
+          build-node: ubuntu1804-docker-8c-16g
+          mvn-params: "-P docker"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+
+    project: "policy/clamp"
+    stream:
       - "london":
           branch: "london"
     mvn-settings: "policy-clamp-settings"
@@ -53,15 +82,15 @@
     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-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-clamp-settings"
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     name: policy-clamp-clm
@@ -73,15 +102,9 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-clamp-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     build-node: ubuntu1804-docker-8c-8g
-    java-version: openjdk11
-
-- project:
-    name: policy-clamp-info
-    project-name: policy-clamp
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: policy/clamp
-    branch: master
+    java-version: openjdk17
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 3bf4aaa26..e9edb0239 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-common
+    name: policy-common-java-17
     project-name: "policy-common"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -18,14 +18,33 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
+      - "montreal":
+          branch: "montreal"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-common-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: policy-common-java11
+    project-name: "policy-common"
+    jobs:
+      - "{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":
+          build-node: centos7-docker-2c-1g
+
+    project: "policy/common"
+    stream:
       - "london":
           branch: "london"
     mvn-settings: "policy-common-settings"
@@ -42,15 +61,15 @@
     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-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-common-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-common-clm
@@ -62,14 +81,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-common-settings"
-    java-version: openjdk11
-
-- project:
-    name: policy-common-info
-    project-name: policy-common
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: policy/common
-    branch: master
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    java-version: openjdk17
diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml
index b42b40258..993a1fb82 100644
--- a/jjb/policy/policy-csit-jobs.yaml
+++ b/jjb/policy/policy-csit-jobs.yaml
@@ -6,7 +6,7 @@
     build-node: "ubuntu1804-docker-8c-8g"
     node: "{build-node}"
     recipients: ""
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     python-version: python3
 
     properties:
@@ -63,7 +63,7 @@
     build-node: "ubuntu1804-docker-8c-8g"
     node: "{build-node}"
     recipients: ""
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     python-version: python3
 
     properties:
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index f5e42e7a9..774cd1ef7 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -10,16 +10,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "distribution"
     trigger_jobs:
@@ -37,16 +31,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "xacml-pdp"
     trigger_jobs:
@@ -64,16 +52,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "drools-applications"
     trigger_jobs:
@@ -91,16 +73,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "drools-pdp"
     trigger_jobs:
@@ -118,16 +94,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "apex-pdp"
     trigger_jobs:
@@ -145,16 +115,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "pap"
     trigger_jobs:
@@ -172,16 +136,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "api"
     trigger_jobs:
@@ -199,16 +157,8 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
-      - "london":
-          branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "clamp"
     trigger_jobs:
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 8b4e123a8..965d16f3c 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-distribution
+    name: policy-distribution-java-17
     project-name: "policy-distribution"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -28,14 +28,43 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
+      - "montreal":
+          branch: "montreal"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-distribution-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: policy-distribution-java11
+    project-name: "policy-distribution"
+    jobs:
+      - "{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"
+      - 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":
+          build-node: centos7-docker-2c-1g
+
+    project: "policy/distribution"
+    stream:
       - "london":
           branch: "london"
     mvn-settings: "policy-distribution-settings"
@@ -52,15 +81,15 @@
     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-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-distribution-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-distribution-clm
@@ -72,14 +101,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-distribution-settings"
-    java-version: openjdk11
-
-- project:
-    name: policy-distribution-info
-    project-name: policy-distribution
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: policy/distribution
-    branch: master
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    java-version: openjdk17
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 7b646e8d7..ee6ae2ce4 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -24,16 +24,6 @@
 
     project: "policy/docker"
     stream:
-      - "master":
-          branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     files: "**"
@@ -41,6 +31,41 @@
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
+    name: policy-docker-base-common-java-17
+    project-name: "policy-docker"
+    jobs:
+      - "{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":
+          build-node: centos7-docker-2c-1g
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-docker-settings"
+    mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+    java-version: openjdk17
+
+    project: "policy/docker"
+    stream:
+      - "master":
+          branch: "master"
+      - "montreal":
+          branch: "montreal"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
     name: policy-docker-clm
     jobs:
       - gerrit-maven-clm
@@ -50,15 +75,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-docker-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
-    java-version: openjdk11
-
-- project:
-    name: policy-docker-info
-    project-name: policy-docker
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: policy/docker
-    branch: master
+    java-version: openjdk17
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 41ec7e75e..6e19128c2 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -26,16 +26,6 @@
 
     project: "policy/drools-applications"
     stream:
-      - "master":
-          branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-drools-applications-settings"
@@ -47,6 +37,45 @@
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
+    name: policy-drools-applications-java-17
+    project-name: "policy-drools-applications"
+    jobs:
+      - "{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"
+      - 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":
+          build-node: centos7-docker-2c-1g
+
+    project: "policy/drools-applications"
+    stream:
+      - "master":
+          branch: "master"
+      - "montreal":
+          branch: "montreal"
+    mvn-settings: "policy-drools-applications-settings"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
     name: policy-drools-applications-sonar
     jobs:
       - gerrit-maven-sonar
@@ -54,7 +83,6 @@
     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"
@@ -62,10 +90,9 @@
     mvn-settings: "policy-drools-applications-settings"
     mvn-version: "mvn36"
     maven-version: "mvn36"
-    java-version: openjdk11
+    java-version: openjdk17
     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
@@ -79,16 +106,8 @@
           branch: "master"
     mvn-settings: "policy-drools-applications-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     mvn-version: "mvn36"
     maven-version: "mvn36"
-    java-version: openjdk11
+    java-version: openjdk17
     build-node: ubuntu1804-docker-8c-8g
-
-- project:
-    name: policy-drools-applications-info
-    project-name: policy-drools-applications
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: policy/drools-applications
-    branch: master
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 8cb8f9092..14a992180 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -26,16 +26,6 @@
 
     project: "policy/drools-pdp"
     stream:
-      - "master":
-          branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-drools-pdp-settings"
@@ -45,6 +35,45 @@
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
+    name: policy-drools-pdp-java-17
+    project-name: "policy-drools-pdp"
+    jobs:
+      - "{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"
+      - 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":
+          build-node: centos7-docker-2c-1g
+
+    project: "policy/drools-pdp"
+    stream:
+      - "master":
+          branch: "master"
+      - "montreal":
+          branch: "montreal"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-drools-pdp-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-8c-8g
+
+- project:
     name: policy-drools-pdp-sonar
     jobs:
       - gerrit-maven-sonar
@@ -52,15 +81,15 @@
     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-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-drools-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-drools-pdp-clm
@@ -73,14 +102,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-drools-pdp-settings"
-    java-version: openjdk11
-
-- project:
-    name: policy-drools-pdp-info
-    project-name: policy-drools-pdp
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: policy/drools-pdp
-    branch: master
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    java-version: openjdk17
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 21b80f274..22675c1d9 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -26,14 +26,6 @@
 
     project: "policy/gui"
     stream:
-      - "master":
-          branch: "master"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-gui-settings"
@@ -43,6 +35,45 @@
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
+    name: policy-gui-java-17
+    project-name: "policy-gui"
+    jobs:
+      - "{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"
+      - 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":
+          build-node: centos7-docker-2c-1g
+
+    project: "policy/gui"
+    stream:
+      - "master":
+          branch: "master"
+      - "montreal":
+          branch: "montreal"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-gui-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
     name: policy-gui-sonar
     jobs:
       - gerrit-maven-sonar-prescan-script
@@ -50,15 +81,15 @@
     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-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-gui-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
     sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
 
 - project:
@@ -71,14 +102,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-gui-settings"
-    java-version: openjdk11
-
-- project:
-    name: policy-gui-info
-    project-name: policy-gui
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: policy/gui
-    branch: master
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    java-version: openjdk17
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index e4daf053a..c84ce415e 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-models
+    name: policy-models-java-17
     project-name: "policy-models"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -28,14 +28,43 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
+      - "montreal":
+          branch: "montreal"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-models-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: policy-models-java11
+    project-name: "policy-models"
+    jobs:
+      - "{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"
+      - 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":
+          build-node: centos7-docker-2c-1g
+
+    project: "policy/models"
+    stream:
       - "london":
           branch: "london"
     mvn-settings: "policy-models-settings"
@@ -52,15 +81,15 @@
     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-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-models-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-models-clm
@@ -72,14 +101,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-models-settings"
-    java-version: openjdk11
-
-- project:
-    name: policy-models-info
-    project-name: policy-models
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: policy/models
-    branch: master
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    java-version: openjdk17
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index c6a6521b0..a62ae1c25 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-pap
+    name: policy-pap-java-17
     project-name: "policy-pap"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -28,14 +28,43 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
+      - "montreal":
+          branch: "montreal"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-pap-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: policy-pap-java11
+    project-name: "policy-pap"
+    jobs:
+      - "{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"
+      - 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":
+          build-node: centos7-docker-2c-1g
+
+    project: "policy/pap"
+    stream:
       - "london":
           branch: "london"
     mvn-settings: "policy-pap-settings"
@@ -52,15 +81,15 @@
     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-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-pap-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-pap-clm
@@ -72,14 +101,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-pap-settings"
-    java-version: openjdk11
-
-- project:
-    name: policy-pap-info
-    project-name: policy-pap
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: policy/pap
-    branch: master
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    java-version: openjdk17
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 0c1a04ca4..d20db0336 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-parent
+    name: policy-parent-java-17
     project-name: "policy-parent"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -18,14 +18,33 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
+      - "montreal":
+          branch: "montreal"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-parent-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: policy-parent-java11
+    project-name: "policy-parent"
+    jobs:
+      - "{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":
+          build-node: centos7-docker-2c-1g
+
+    project: "policy/parent"
+    stream:
       - "london":
           branch: "london"
     mvn-settings: "policy-parent-settings"
@@ -44,14 +63,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-parent-settings"
-    java-version: openjdk11
-
-- project:
-    name: policy-parent-info
-    project-name: policy-parent
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: policy/parent
-    branch: master
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    java-version: openjdk17
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 244e97f0b..4f25778d9 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -26,16 +26,6 @@
 
     project: "policy/xacml-pdp"
     stream:
-      - "master":
-          branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-xacml-pdp-settings"
@@ -45,6 +35,45 @@
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
+    name: policy-xacml-pdp-java-17
+    project-name: "policy-xacml-pdp"
+    jobs:
+      - "{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"
+      - 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":
+          build-node: centos7-docker-2c-1g
+
+    project: "policy/xacml-pdp"
+    stream:
+      - "master":
+          branch: "master"
+      - "montreal":
+          branch: "montreal"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    mvn-settings: "policy-xacml-pdp-settings"
+    java-version: openjdk17
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
     name: policy-xacml-pdp-sonar
     jobs:
       - gerrit-maven-sonar
@@ -52,15 +81,15 @@
     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-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-xacml-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-xacml-pdp-clm
@@ -72,14 +101,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     mvn-settings: "policy-xacml-pdp-settings"
-    java-version: openjdk11
-
-- project:
-    name: policy-xacml-pdp-info
-    project-name: policy-xacml-pdp
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: policy/xacml-pdp
-    branch: master
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    java-version: openjdk17