1 files changed, 15 insertions, 40 deletions
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index e1cfe9d4a..d94bf4b7f 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -10,19 +10,21 @@
     project-name: 'policy-apex-pdp'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
+      - '{project-name}-{stream}-merge-java':
+         docker-pom: 'pom.xml'
+         mvn-profile: 'docker'
+         mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+
     project: 'policy/apex-pdp'
     stream:
       - 'master':
@@ -30,34 +32,7 @@
     mvn-settings: 'policy-apex-pdp-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-apex-pdp-dublin
-    project-name: 'policy-apex-pdp-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'policy/apex-pdp'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-apex-pdp-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
 
 - project:
     name: policy-apex-pdp-sonar