X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpolicy%2Fpolicy-apex-pdp.yaml;h=e4325799354887b671c831a8c755efec23707fb6;hb=509d5a8ab62d6e92a27b6931a7e39359763938bc;hp=08a35aceb87a0488c90bbd289d1bcd725988cfdc;hpb=86af1067030c622c32ebfa0246482bd69ba45411;p=ci-management.git

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 08a35aceb..e43257993 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,6 +34,41 @@
     stream:
       - "master":
           branch: "master"
+    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:
       - "honolulu":
           branch: "honolulu"
       - "istanbul":
@@ -42,6 +77,8 @@
           branch: "jakarta"
       - "kohn":
           branch: "kohn"
+      - "london":
+          branch: "london"
     mvn-settings: "policy-apex-pdp-settings"
     java-version: openjdk11
     files: "**"
@@ -61,8 +98,10 @@
     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"
 
@@ -76,14 +115,7 @@
     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
+    java-version: openjdk17