diff --git a/global-jjb b/global-jjb
index aee2dcb..a2cfbc6 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit aee2dcb2ba92589124fbdfd9cd48cb29529063da
+Subproject commit a2cfbc66e675655ed0fb7d76862fdc044d96678d
diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
deleted file mode 100644
index 4b10074..0000000
--- a/jjb/aai/aai-chameleon.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-- project:
-    name: aai-chameleon-project-view
-    project-name: aai-chameleon
-    views:
-      - project-view
-
-- project:
-    name: aai-chameleon
-    project-name: 'aai-chameleon'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          mvn-params: 'package dockerfile:build dockerfile:push -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          build-node: ubuntu1604-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'aai/chameleon'
-    stream:
-      - 'elalto':
-          branch: 'elalto'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-chameleon-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: aai-chameleon-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/chameleon'
-    project-name: 'aai-chameleon'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-chameleon-settings'
-
-- project:
-    name: aai-chameleon-info
-    project-name: aai-chameleon
-    jobs:
-      - gerrit-info-yaml-verify
-    project: aai/chameleon
-    branch: master
diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
deleted file mode 100644
index cbce3ed..0000000
--- a/jjb/aai/aai-gallifrey.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-- project:
-    name: aai-gallifrey
-    project-name: 'aai-gallifrey'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          mvn-params: 'package dockerfile:build dockerfile:push -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          build-node: ubuntu1604-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'aai/gallifrey'
-    stream:
-      - 'elalto':
-          branch: 'elalto'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-gallifrey-settings'
-    files: '**'
-    archive-artifacts: ''
-
-- project:
-    name: aai-gallifrey-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/gallifrey'
-    project-name: 'aai-gallifrey'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-gallifrey-settings'
-
-- project:
-    name: aai-gallifrey-info
-    project-name: aai-gallifrey
-    jobs:
-      - gerrit-info-yaml-verify
-    project: aai/gallifrey
-    branch: master
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 6e690fa..e1ddf76 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -10,7 +10,8 @@
     project-name: 'ccsdk-apps'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index ea3d291..cc4c33d 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-cds'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 104ebc4..eb72293 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-distribution'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index a5df9d0..1b5abba 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-features'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index cd04db7..38ed199 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -6,6 +6,7 @@
       - gerrit-maven-verify
       - gerrit-maven-merge:
           cron: '@daily'
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 23480cf..c274881 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-sli-adaptors'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 9f41d4c..b84d3ae 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-sli-core'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 99116ce..ebcc368 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-sli-northbound'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
       - '{project-name}-gerrit-release-jobs':
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index e4c7429..4eec8b2 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -4,7 +4,8 @@
     project-name: 'ccsdk-sli-plugins'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          mvn-params: '-P dependency-list'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml
new file mode 100644
index 0000000..b8387d0
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-distributorapi.yaml
@@ -0,0 +1,34 @@
+---
+# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-mod-distributorapi
+    # root of docker build
+    docker-root: mod/distributorapi
+    # image name
+    docker-name: '{name}'
+    stream:
+      - master:
+            branch: master
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcagen2-platform-mod-distributorapi-verify
+    docker-root: mod/distributorapi
+    stream:
+      - all:
+            branch: '*'
+    jobs:
+      - gerrit-tox-verify
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-mod-distributorapi-sonar
+    docker-root: mod/distributorapi
+    branch: master
+    jobs:
+      - gerrit-tox-sonar
+    cron: '@daily'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml
new file mode 100644
index 0000000..ffe5640
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-onboardingapi.yaml
@@ -0,0 +1,34 @@
+---
+# dcagen2_platform_common is defined in dcaegen2-platform-adapter.yaml
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-mod-onboardingapi
+    # root of docker build
+    docker-root: mod/onboardingapi
+    # image name
+    docker-name: '{name}'
+    stream:
+      - master:
+            branch: master
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcagen2-platform-mod-onboardingapi-verify
+    docker-root: mod/onboardingapi
+    stream:
+      - all:
+            branch: '*'
+    jobs:
+      - gerrit-tox-verify
+
+- project:
+    <<: *dcaegen2_platform_common
+    name: dcaegen2-platform-mod-onboardingapi-sonar
+    docker-root: mod/onboardingapi
+    branch: master
+    jobs:
+      - gerrit-tox-sonar
+    cron: '@daily'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod.yaml b/jjb/dcaegen2/dcaegen2-platform-mod.yaml
new file mode 100644
index 0000000..1baf6c0
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod.yaml
@@ -0,0 +1,8 @@
+---
+
+- project:
+    name: dcaegen2-platform-mod-project-view
+    project-name: dcaegen2-platform-mod
+    views:
+      - project-view
+
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 0f2205d..3ac5b25 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -17,6 +17,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-common-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index d48b0d6..dca2452 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -17,6 +17,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'policy-parent-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g