[POLICY] Move all PF master jobs to java17 environment

- update sonar and clm jobs to java17 env
- update mvn version for java17 jobs

Issue-ID: POLICY-4665
Change-Id: I77c79be066aa3c7b0bbf31d42e6cca317ba15799
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

15 files changed, 126 insertions, 220 deletions

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index b267a8089..99545da81 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -32,8 +32,10 @@
 
     project: "policy/apex-pdp"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-apex-pdp-settings"
     java-version: openjdk17
     files: "**"
@@ -67,8 +69,6 @@
 
     project: "policy/apex-pdp"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -98,8 +98,10 @@
     project: "policy/apex-pdp"
     project-name: "policy-apex-pdp"
     branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-apex-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
@@ -113,5 +115,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-apex-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 04f4276d6..88549e28e 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -26,8 +26,10 @@
 
     project: "policy/api"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-api-settings"
     java-version: openjdk17
     files: "**"
@@ -61,8 +63,6 @@
 
     project: "policy/api"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -93,7 +93,9 @@
     project-name: "policy-api"
     branch: "master"
     mvn-settings: "policy-api-settings"
-    java-version: openjdk11
+    java-version: openjdk17
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
@@ -107,5 +109,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-api-settings"
-    java-version: openjdk11
+    java-version: openjdk17
diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index 5d439e8fb..ff63202f9 100644
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -26,8 +26,10 @@
 
     project: "policy/clamp"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-clamp-settings"
     java-version: openjdk17
     files: "**"
@@ -62,8 +64,6 @@
 
     project: "policy/clamp"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -93,10 +93,12 @@
     project: "policy/clamp"
     project-name: "policy-clamp"
     branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     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
@@ -108,6 +110,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-clamp-settings"
     build-node: ubuntu1804-docker-8c-8g
-    java-version: openjdk11
+    java-version: openjdk17
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index d01bb1d5d..ced3a737b 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -16,8 +16,10 @@
 
     project: "policy/common"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-common-settings"
     java-version: openjdk17
     files: "**"
@@ -41,8 +43,6 @@
 
     project: "policy/common"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -72,8 +72,10 @@
     project: "policy/common"
     project-name: "policy-common"
     branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-common-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
@@ -87,5 +89,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-common-settings"
-    java-version: openjdk11
+    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 a7d1e38ec..f5e42e7a9 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -27,23 +27,6 @@
       - "policy-docker-{stream}-merge-java"
 
 - project:
-    name: policy-distribution-project-csit-java-17
-    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"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "distribution"
-    trigger_jobs:
-      - "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}"
@@ -71,23 +54,6 @@
       - "policy-docker-{stream}-merge-java"
 
 - project:
-    name: policy-xacml-pdp-project-csit-java-17
-    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"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "xacml-pdp"
-    trigger_jobs:
-      - "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}"
@@ -115,23 +81,6 @@
       - "policy-docker-{stream}-merge-java"
 
 - project:
-    name: policy-drools-applications-project-csit-java-17
-    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"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "drools-applications"
-    trigger_jobs:
-      - "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}"
@@ -159,23 +108,6 @@
       - "policy-docker-{stream}-merge-java"
 
 - project:
-    name: policy-drools-pdp-project-csit-java-17
-    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"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "drools-pdp"
-    trigger_jobs:
-      - "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}"
@@ -203,23 +135,6 @@
       - "policy-docker-{stream}-merge-java"
 
 - project:
-    name: policy-apex-pdp-project-csit-java-17
-    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"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "apex-pdp"
-    trigger_jobs:
-      - "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}"
@@ -247,23 +162,6 @@
       - "policy-docker-{stream}-merge-java"
 
 - project:
-    name: policy-pap-project-csit-java-17
-    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"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "pap"
-    trigger_jobs:
-      - "policy-pap-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
-
-- project:
     name: policy-api-project-csit
     jobs:
       - "{project-name}-{stream}-project-csit-verify-{functionality}"
@@ -291,23 +189,6 @@
       - "policy-docker-{stream}-merge-java"
 
 - project:
-    name: policy-api-project-csit-java-17
-    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"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "api"
-    trigger_jobs:
-      - "policy-api-{stream}-merge-java"
-      - "policy-docker-{stream}-merge-java"
-
-- project:
     name: policy-clamp-project-csit
     jobs:
       - "{project-name}-{stream}-project-csit-verify-{functionality}"
@@ -335,23 +216,6 @@
       - "policy-docker-{stream}-merge-java"
 
 - project:
-    name: policy-clamp-project-csit-java-17
-    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"
-    stream:
-      - "java-17":
-          branch: "java-17"
-    functionality:
-      - "clamp"
-    trigger_jobs:
-      - "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}"
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index b673b3ffb..184da6cc3 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -26,8 +26,10 @@
 
     project: "policy/distribution"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-distribution-settings"
     java-version: openjdk17
     files: "**"
@@ -61,8 +63,6 @@
 
     project: "policy/distribution"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -92,8 +92,10 @@
     project: "policy/distribution"
     project-name: "policy-distribution"
     branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-distribution-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
@@ -107,5 +109,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-distribution-settings"
-    java-version: openjdk11
+    java-version: openjdk17
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 347710512..827b7b0c5 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -24,8 +24,6 @@
 
     project: "policy/docker"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -59,14 +57,16 @@
           container-staging-registry: "nexus3.onap.org:10003"
       - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-docker-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     java-version: openjdk17
 
     project: "policy/docker"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
     files: "**"
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
@@ -81,6 +81,8 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-docker-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
-    java-version: openjdk11
+    java-version: openjdk17
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index a7ff6b9b4..8c068bd55 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -26,8 +26,6 @@
 
     project: "policy/drools-applications"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -73,11 +71,11 @@
 
     project: "policy/drools-applications"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
     mvn-settings: "policy-drools-applications-settings"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     java-version: openjdk17
     files: "**"
     archive-artifacts: ""
@@ -97,9 +95,9 @@
     project-name: "policy-drools-applications"
     branch: "master"
     mvn-settings: "policy-drools-applications-settings"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    java-version: openjdk11
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    java-version: openjdk17
     java-opts: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
@@ -116,7 +114,7 @@
           branch: "master"
     mvn-settings: "policy-drools-applications-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    java-version: openjdk11
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
+    java-version: openjdk17
     build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 8f1a5be92..10b11b1e0 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -26,8 +26,6 @@
 
     project: "policy/drools-pdp"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -71,8 +69,10 @@
 
     project: "policy/drools-pdp"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-drools-pdp-settings"
     java-version: openjdk17
     files: "**"
@@ -92,8 +92,10 @@
     project: "policy/drools-pdp"
     project-name: "policy-drools-pdp"
     branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-drools-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
@@ -108,5 +110,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-drools-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 2ec00e254..9f87f274b 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -26,8 +26,6 @@
 
     project: "policy/gui"
     stream:
-      - "master":
-          branch: "master"
       - "istanbul":
           branch: "istanbul"
       - "jakarta":
@@ -69,8 +67,10 @@
 
     project: "policy/gui"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-gui-settings"
     java-version: openjdk17
     files: "**"
@@ -90,8 +90,10 @@
     project: "policy/gui"
     project-name: "policy-gui"
     branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     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
@@ -106,5 +108,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-gui-settings"
-    java-version: openjdk11
+    java-version: openjdk17
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 180b0228f..164b76f0c 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -26,8 +26,10 @@
 
     project: "policy/models"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-models-settings"
     java-version: openjdk17
     files: "**"
@@ -61,8 +63,6 @@
 
     project: "policy/models"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -92,8 +92,10 @@
     project: "policy/models"
     project-name: "policy-models"
     branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-models-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
@@ -107,5 +109,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-models-settings"
-    java-version: openjdk11
+    java-version: openjdk17
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 2902dbead..26e24277a 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -26,8 +26,10 @@
 
     project: "policy/pap"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-pap-settings"
     java-version: openjdk17
     files: "**"
@@ -61,8 +63,6 @@
 
     project: "policy/pap"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -92,8 +92,10 @@
     project: "policy/pap"
     project-name: "policy-pap"
     branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-pap-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
@@ -107,5 +109,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-pap-settings"
-    java-version: openjdk11
+    java-version: openjdk17
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 520efcd4a..2fd20af52 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -16,8 +16,10 @@
 
     project: "policy/parent"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-parent-settings"
     java-version: openjdk17
     files: "**"
@@ -41,8 +43,6 @@
 
     project: "policy/parent"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -69,5 +69,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-parent-settings"
-    java-version: openjdk11
+    java-version: openjdk17
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index fbd2ec7e3..4c39a0728 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -26,8 +26,6 @@
 
     project: "policy/xacml-pdp"
     stream:
-      - "master":
-          branch: "master"
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -71,8 +69,10 @@
 
     project: "policy/xacml-pdp"
     stream:
-      - "java-17":
-          branch: "java-17"
+      - "master":
+          branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-xacml-pdp-settings"
     java-version: openjdk17
     files: "**"
@@ -92,8 +92,10 @@
     project: "policy/xacml-pdp"
     project-name: "policy-xacml-pdp"
     branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-xacml-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
@@ -107,5 +109,7 @@
     stream:
       - "master":
           branch: "master"
+    mvn-version: "mvn39"
+    maven-version: "mvn39"
     mvn-settings: "policy-xacml-pdp-settings"
-    java-version: openjdk11
+    java-version: openjdk17