Move projects to gerrit-maven-sonar

The current Sonar goal in release-version-java-daily
has a lot of issues when running for projects in more than
one branch.
Remove sonar task from release-version-java-daily and use
global-jjb gerrit-maven-sonar job instead.

Change-Id: I9a20b68f4539e227ceab4063edb2df429cf60afb
Issue-ID: CIMAN-126
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

118 files changed, 1373 insertions, 92 deletions

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 89eb4289b..8e1624c2a 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -22,4 +22,15 @@
     mvn-profile: docker
     docker-pom: 'authz-service/pom.xml'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: aaf-authz-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aaf/authz'
+    project-name: 'aaf-authz'
+    branch: 'master'
+    mvn-settings: 'aaf-authz-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index d8037596d..ebccaf48f 100644
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -18,4 +18,15 @@
           branch: 'master'
     mvn-settings: 'aaf-cadi-settings'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: aaf-cadi-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aaf/cadi'
+    project-name: 'aaf-cadi'
+    branch: 'master'
+    mvn-settings: 'aaf-cadi-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml
index 22d8a2231..aacbbfde0 100644
--- a/jjb/aaf/aaf-inno.yaml
+++ b/jjb/aaf/aaf-inno.yaml
@@ -18,4 +18,15 @@
           branch: 'master'
     mvn-settings: 'aaf-inno-settings'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: aaf-inno-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aaf/inno'
+    project-name: 'aaf-inno'
+    branch: 'master'
+    mvn-settings: 'aaf-inno-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 421f4c6df..bdeca8958 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -41,3 +41,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-aai-common-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/aai-common'
+    project-name: 'aai-aai-common'
+    branch: 'master'
+    mvn-settings: 'aai-aai-common-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml
index 48514f623..4b26e87e2 100644
--- a/jjb/aai/aai-aai-service.yaml
+++ b/jjb/aai/aai-aai-service.yaml
@@ -17,3 +17,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-aai-service-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/aai-service'
+    project-name: 'aai-aai-service'
+    branch: 'master'
+    mvn-settings: 'aai-aai-service-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 30162c76a..02a124dba 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -19,3 +19,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-babel-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/babel'
+    project-name: 'aai-babel'
+    branch: 'master'
+    mvn-settings: 'aai-babel-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index ce859701c..8fe47902c 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -20,3 +20,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-champ-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/champ'
+    project-name: 'aai-champ'
+    branch: 'master'
+    mvn-settings: 'aai-champ-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index 8d1a83779..bb42c5a01 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -37,3 +37,14 @@
     mvn-settings: 'aai-data-router-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: aai-data-router-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/data-router'
+    project-name: 'aai-data-router'
+    branch: 'master'
+    mvn-settings: 'aai-data-router-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index face2b853..179be2572 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -22,3 +22,14 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-esr-gui-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/esr-gui'
+    project-name: 'aai-esr-gui'
+    branch: 'master'
+    mvn-settings: 'aai-esr-gui-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 3a9f31c1d..78d6ba3c5 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -41,3 +41,14 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-esr-server-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/esr-server'
+    project-name: 'aai-esr-server'
+    branch: 'master'
+    mvn-settings: 'aai-esr-server-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 326b0c51a..115966488 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -33,3 +33,14 @@
     mvn-settings: 'aai-logging-service-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: aai-logging-service-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/logging-service'
+    project-name: 'aai-logging-service'
+    branch: 'master'
+    mvn-settings: 'aai-logging-service-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index a75a7126c..16af465c7 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -39,3 +39,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-model-loader-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/model-loader'
+    project-name: 'aai-model-loader'
+    branch: 'master'
+    mvn-settings: 'aai-model-loader-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 5bf70c882..f0649671b 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -47,3 +47,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-resources-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/resources'
+    project-name: 'aai-resources'
+    branch: 'master'
+    mvn-settings: 'aai-resources-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 0bd90eb0c..e1da9a706 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -31,3 +31,14 @@
     mvn-settings: 'aai-rest-client-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: aai-rest-client-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/rest-client'
+    project-name: 'aai-rest-client'
+    branch: 'master'
+    mvn-settings: 'aai-rest-client-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index 4dd1c1f22..0e1ff956d 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -31,3 +31,14 @@
     mvn-settings: 'aai-router-core-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: aai-router-core-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/router-core'
+    project-name: 'aai-router-core'
+    branch: 'master'
+    mvn-settings: 'aai-router-core-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 8fc52a8ae..578683c22 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -37,3 +37,14 @@
     mvn-settings: 'aai-sparky-be-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: aai-sparky-be-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/sparky-be'
+    project-name: 'aai-sparky-be'
+    branch: 'master'
+    mvn-settings: 'aai-sparky-be-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index bec805f26..94df799e8 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -18,3 +18,14 @@
     mvn-settings: 'aai-sparky-fe-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: aai-sparky-fe-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/sparky-fe'
+    project-name: 'aai-sparky-fe'
+    branch: 'master'
+    mvn-settings: 'aai-sparky-fe-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 808d741eb..66b671c96 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -47,3 +47,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: aai-traversal-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'aai/traversal'
+    project-name: 'aai-traversal'
+    branch: 'master'
+    mvn-settings: 'aai-traversal-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index 782e6e253..e59f818c3 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -25,3 +25,14 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: appc-deployment-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'appc/deployment'
+    project-name: 'appc-deployment'
+    branch: 'master'
+    mvn-settings: 'appc-deployment-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index ef16fad4d..31e8a04ab 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -21,3 +21,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: appc-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'appc'
+    project-name: 'appc'
+    branch: 'master'
+    mvn-settings: 'appc-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 05a134d9a..7deeeebc1 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -20,3 +20,14 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-dashboard-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'ccsdk/dashboard'
+    project-name: 'ccsdk-dashboard'
+    branch: 'master'
+    mvn-settings: 'ccsdk-dashboard-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 6cc35c800..ed5470cf4 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -23,3 +23,14 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-docker-8c-8g
+- project:
+    name: ccsdk-distribution-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'ccsdk/distribution'
+    project-name: 'ccsdk-distribution'
+    branch: 'master'
+    mvn-settings: 'ccsdk-distribution-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index ac8024c1c..993a25ea4 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -23,3 +23,14 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-parent-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'ccsdk/parent'
+    project-name: 'ccsdk-parent'
+    branch: 'master'
+    mvn-settings: 'ccsdk-parent-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml
index cbd51ddb6..5fa2fce0f 100644
--- a/jjb/ccsdk/platform-nbapi.yaml
+++ b/jjb/ccsdk/platform-nbapi.yaml
@@ -23,3 +23,14 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-platform-nbapi-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'ccsdk/platform/nbapi'
+    project-name: 'ccsdk-platform-nbapi'
+    branch: 'master'
+    mvn-settings: 'ccsdk-platform-nbapi-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml
index 1fc194a5f..6c5c326aa 100644
--- a/jjb/ccsdk/platform-plugins.yaml
+++ b/jjb/ccsdk/platform-plugins.yaml
@@ -21,3 +21,14 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-platform-plugins-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'ccsdk/platform/plugins'
+    project-name: 'ccsdk-platform-plugins'
+    branch: 'master'
+    mvn-settings: 'ccsdk-platform-plugins-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 7ef392550..527687cd8 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -24,3 +24,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: ccsdk-sli-adaptors-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'ccsdk/sli/adaptors'
+    project-name: 'ccsdk-sli-adaptors'
+    branch: 'master'
+    mvn-settings: 'ccsdk-sli-adaptors-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 45ec03993..a5f715d02 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -24,3 +24,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: ccsdk-sli-core-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'ccsdk/sli/core'
+    project-name: 'ccsdk-sli-core'
+    branch: 'master'
+    mvn-settings: 'ccsdk-sli-core-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index aacb71c71..ea74f105d 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -24,3 +24,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: ccsdk-sli-northbound-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'ccsdk/sli/northbound'
+    project-name: 'ccsdk-sli-northbound'
+    branch: 'master'
+    mvn-settings: 'ccsdk-sli-northbound-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index e24c1ca7e..a213c7c3c 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -23,3 +23,14 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-sli-plugins-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'ccsdk/sli/plugins'
+    project-name: 'ccsdk-sli-plugins'
+    branch: 'master'
+    mvn-settings: 'ccsdk-sli-plugins-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml
index 796163342..1cbd8b9e0 100644
--- a/jjb/ccsdk/storage-pgaas.yaml
+++ b/jjb/ccsdk/storage-pgaas.yaml
@@ -23,3 +23,14 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-storage-pgaas-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'ccsdk/storage/pgaas'
+    project-name: 'ccsdk-storage-pgaas'
+    branch: 'master'
+    mvn-settings: 'ccsdk-storage-pgaas-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index b0d53baa8..e8e5f7a51 100644
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -23,3 +23,14 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: ccsdk-utils-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'ccsdk/utils'
+    project-name: 'ccsdk-utils'
+    branch: 'master'
+    mvn-settings: 'ccsdk-utils-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 20776992a..11d4a0059 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -37,3 +37,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
+- project:
+    name: clamp-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'clamp'
+    project-name: 'clamp'
+    branch: 'master'
+    mvn-settings: 'clamp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 1c3905289..4d398ba0b 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -27,3 +27,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: cli-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'cli'
+    project-name: 'cli'
+    branch: 'master'
+    mvn-settings: 'cli-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml
index 4e6f2f3c6..99c68dcf3 100644
--- a/jjb/dcaegen2/apod-analytics.yaml
+++ b/jjb/dcaegen2/apod-analytics.yaml
@@ -1,27 +1,38 @@
----

-- project:

-    name: dcaegen2-analytics-tca

-

-    # job template iterators

-    project-name: 'dcaegen2-analytics-tca'

-    stream:

-      - 'master':

-          branch: 'master'

-      - 'amsterdam':

-          branch: 'amsterdam'

-

-    # apply to all jobs

-    project: 'dcaegen2/analytics/tca'

-    mvn-settings: 'dcaegen2-analytics-tca-settings'

-    files: '**'

-    maven-deploy-properties: |

-      deployAtEnd=true

-    archive-artifacts: ''

-    build-node: ubuntu1604-basebuild-4c-4g

-

-    jobs:

-      - '{project-name}-{stream}-release-version-java-daily'

-      - '{project-name}-{stream}-verify-java-skip-tests':

-          mvn-goals: 'clean install'

-      - '{project-name}-{stream}-merge-java':

-          mvn-goals: 'clean deploy'

+---
+- project:
+    name: dcaegen2-analytics-tca
+
+    # job template iterators
+    project-name: 'dcaegen2-analytics-tca'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
+
+    # apply to all jobs
+    project: 'dcaegen2/analytics/tca'
+    mvn-settings: 'dcaegen2-analytics-tca-settings'
+    files: '**'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
+
+    jobs:
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-verify-java-skip-tests':
+          mvn-goals: 'clean install'
+      - '{project-name}-{stream}-merge-java':
+          mvn-goals: 'clean deploy'
+- project:
+    name: dcaegen2-analytics-tca-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/analytics/tca'
+    project-name: 'dcaegen2-analytics-tca'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-analytics-tca-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml
index 5edbd1eeb..30ed1d0bf 100644
--- a/jjb/dcaegen2/dcaegen2-analytics.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-analytics-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/analytics'
+    project-name: 'dcaegen2-analytics'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-analytics-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 4053148c3..74e707075 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-collectors-snmptrap-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/collectors/snmptrap'
+    project-name: 'dcaegen2-collectors-snmptrap'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 4f03d9939..b1b319d36 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-collectors-ves-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/collectors/ves'
+    project-name: 'dcaegen2-collectors-ves'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-collectors-ves-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml
index c0b39cb35..a13ebae6a 100644
--- a/jjb/dcaegen2/dcaegen2-collectors.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-collectors-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/collectors'
+    project-name: 'dcaegen2-collectors'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-collectors-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index deaab94fd..38623d0cd 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-deployments-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/deployments'
+    project-name: 'dcaegen2-deployments'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-deployments-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index ab047d53f..b55b73c5f 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-blueprints-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/platform/blueprints'
+    project-name: 'dcaegen2-platform-blueprints'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-blueprints-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
index ce4f8484b..40c415e99 100644
--- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-cdapbroker-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/platform/cdapbroker'
+    project-name: 'dcaegen2-platform-cdapbroker'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-cdapbroker-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
index 19460414d..e81d0745e 100644
--- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-cli-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/platform/cli'
+    project-name: 'dcaegen2-platform-cli'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-cli-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 6109812b9..064592ee4 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-configbinding-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/platform/configbinding'
+    project-name: 'dcaegen2-platform-configbinding'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-configbinding-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
index 3c21e9b42..ef7b58bcf 100644
--- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-deployment-handler-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/platform/deployment-handler'
+    project-name: 'dcaegen2-platform-deployment-handler'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-deployment-handler-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 543c627b1..aa3447d50 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -26,3 +26,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-inventory-api-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/platform/inventory-api'
+    project-name: 'dcaegen2-platform-inventory-api'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-inventory-api-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 560713812..7bb5a3908 100644
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-plugins-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/platform/plugins'
+    project-name: 'dcaegen2-platform-plugins'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-plugins-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
index ccff1c56c..326d111fd 100644
--- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-policy-handler-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/platform/policy-handler'
+    project-name: 'dcaegen2-platform-policy-handler'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-policy-handler-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index e2821a90d..188fd8994 100644
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -26,3 +26,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-platform-servicechange-handler-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/platform/servicechange-handler'
+    project-name: 'dcaegen2-platform-servicechange-handler'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml
index ce12261f5..3a2103670 100644
--- a/jjb/dcaegen2/dcaegen2-platform.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform.yaml
@@ -21,3 +21,14 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: dcaegen2-platform-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/platform'
+    project-name: 'dcaegen2-platform'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 3f4f16124..418cff4f9 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-utils-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/utils'
+    project-name: 'dcaegen2-utils'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-utils-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index 6fb6fccc1..2087553a1 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -24,3 +24,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-docker-8c-8g'
+- project:
+    name: dcaegen2-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2'
+    project-name: 'dcaegen2'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index cebe89552..15904c70e 100644
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -21,3 +21,14 @@
     mvn-settings: 'demo-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: demo-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'demo'
+    project-name: 'demo'
+    branch: 'master'
+    mvn-settings: 'demo-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index f18d86347..c63d47486 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -21,3 +21,14 @@
     mvn-settings: 'dmaap-buscontroller-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: dmaap-buscontroller-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dmaap/buscontroller'
+    project-name: 'dmaap-buscontroller'
+    branch: 'master'
+    mvn-settings: 'dmaap-buscontroller-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index 6ca5a0634..5d921e7c5 100644
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -21,3 +21,14 @@
     mvn-settings: 'dmaap-dbcapi-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: dmaap-dbcapi-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dmaap/dbcapi'
+    project-name: 'dmaap-dbcapi'
+    branch: 'master'
+    mvn-settings: 'dmaap-dbcapi-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 19e782542..fcb558ede 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -20,4 +20,15 @@
           branch: 'amsterdam'
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: dmaap-messagerouter-dmaapclient-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dmaap/messagerouter/dmaapclient'
+    project-name: 'dmaap-messagerouter-dmaapclient'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 7dcfa2add..f1c885b23 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -20,4 +20,15 @@
           branch: 'amsterdam'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: dmaap-messagerouter-messageservice-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dmaap/messagerouter/messageservice'
+    project-name: 'dmaap-messagerouter-messageservice'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 89b942be8..abbb1fa63 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -1,23 +1,34 @@
----

-- project:

-    name: dmaap-messagerouter-mirroragent

-    project-name: 'dmaap-messagerouter-mirroragent'

-    jobs:

+---
+- project:
+    name: dmaap-messagerouter-mirroragent
+    project-name: 'dmaap-messagerouter-mirroragent'
+    jobs:
       - gerrit-maven-clm:
           java-version: ''
-      - '{project-name}-{stream}-verify-java'

-      - '{project-name}-{stream}-merge-java'

-      - '{project-name}-{stream}-release-version-java-daily'

-      - '{project-name}-{stream}-stage-site-java':

-          site-pom: 'pom.xml'

-          trigger-job: '{project-name}-{stream}-release-version-java-daily'

-          mvn-goals: 'clean install'

-    project: 'dmaap/messagerouter/mirroragent'

-    stream:

-      - 'master':

-          branch: 'master'

+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          mvn-goals: 'clean install'
+    project: 'dmaap/messagerouter/mirroragent'
+    stream:
+      - 'master':
+          branch: 'master'
       - 'amsterdam':
           branch: 'amsterdam'
-    mvn-settings: 'dmaap-messagerouter-mirroragent-settings'

-    files: '**'

-    archive-artifacts: ''
\ No newline at end of file
+    mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
+    files: '**'
+    archive-artifacts: ''
+- project:
+    name: dmaap-messagerouter-mirroragent-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dmaap/messagerouter/mirroragent'
+    project-name: 'dmaap-messagerouter-mirroragent'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 748b0d515..ebe710617 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -20,4 +20,15 @@
           branch: 'amsterdam'
     mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
     files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    archive-artifacts: ''
+- project:
+    name: dmaap-messagerouter-msgrtr-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dmaap/messagerouter/msgrtr'
+    project-name: 'dmaap-messagerouter-msgrtr'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 61b4b0700..fc13a15ba 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -366,7 +366,7 @@
 
       - maven-target:
           maven-version: '{maven-version}'
-          goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
@@ -516,7 +516,7 @@
                 global-settings-type: cfp
       - maven-target:
           maven-version: '{maven-version}'
-          goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties: '{obj:mvn_properties}'
           settings: '{mvn-settings}'
@@ -756,7 +756,7 @@
 
       - maven-target:
           maven-version: '{maven-version}'
-          goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
@@ -834,7 +834,7 @@
 
       - maven-target:
           maven-version: '{maven-version}'
-          goals: 'clean deploy sonar:sonar -P {mvn-profile} -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy -P {mvn-profile} -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
@@ -904,7 +904,7 @@
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
@@ -989,7 +989,7 @@
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
@@ -2121,7 +2121,6 @@
     # 2. change version in all POM files to the release version specified
     #    in version.properties. This is done using a script instread of
     #    the mvn version plugin that assumes some specific parent structure
-    # 3. runs maven clean deploy sonar
     #
     # The POM files are required to use the Maven staging plugin so the deploy
     # does not deploy directly to the release repo.
@@ -2179,8 +2178,7 @@
 
       - maven-target:
           maven-version: '{maven-version}'
-          goals: 'clean deploy sonar:sonar site:site site:stage-deploy
-            -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy site:site site:stage-deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
@@ -2201,7 +2199,6 @@
     # 2. change version in all POM files to the release version specified
     #     in version.properties. This is done using a script instread of
     #     the mvn version plugin that assumes some specific parent structure
-    # 3. runs maven clean deploy sonar
     #
     # The POM files are required to use the Maven staging plugin so the deploy
     # does not deploy directly to the release repo.
@@ -2264,8 +2261,7 @@
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean deploy sonar:sonar site:site site:stage-deploy
-            -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy site:site site:stage-deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
@@ -2287,7 +2283,6 @@
     #     in version.properties. This is done using a script instread of
     #     the mvn version plugin that assumes some specific parent structure
     #     This version does NOT change the version within the <parent> tag
-    #  3. runs maven clean deploy sonar
     #
     # The POM files are required to use the Maven staging plugin so the deploy
     # does not deploy directly to the release repo.
@@ -2350,8 +2345,7 @@
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean deploy sonar:sonar site:site site:stage-deploy
-            -Dsonar.host.url=${{SONAR}} -B
+          goals: 'clean deploy site:site site:stage-deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 9e1a46a8f..07db7f797 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -19,3 +19,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: holmes-common-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'holmes/common'
+    project-name: 'holmes-common'
+    branch: 'master'
+    mvn-settings: 'holmes-common-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml
index 8f99cce1b..a998c3e50 100644
--- a/jjb/holmes/holmes-dsa.yaml
+++ b/jjb/holmes/holmes-dsa.yaml
@@ -22,3 +22,14 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: holmes-dsa-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'holmes/dsa'
+    project-name: 'holmes-dsa'
+    branch: 'master'
+    mvn-settings: 'holmes-dsa-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 9a05cde6b..ea0439671 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -22,3 +22,14 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: holmes-engine-management-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'holmes/engine-management'
+    project-name: 'holmes-engine-management'
+    branch: 'master'
+    mvn-settings: 'holmes-engine-management-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 5b28e2e4b..4ba943e3d 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -22,3 +22,14 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: holmes-rule-management-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'holmes/rule-management'
+    project-name: 'holmes-rule-management'
+    branch: 'master'
+    mvn-settings: 'holmes-rule-management-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 816c006c9..93b382de5 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -20,3 +20,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: integration-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'integration'
+    project-name: 'integration'
+    branch: 'master'
+    mvn-settings: 'integration-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 8459ad195..aa22414e6 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -25,3 +25,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: logging-analytics-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'logging-analytics'
+    project-name: 'logging-analytics'
+    branch: 'master'
+    mvn-settings: 'logging-analytics-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
index 2b7696859..48e52e478 100644
--- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
@@ -25,3 +25,14 @@
           skip.docker.build=false
           skip.docker.tag=false
           skip.docker.push=false
+- project:
+    name: modeling-toscaparsers-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'modeling/toscaparsers'
+    project-name: 'modeling-toscaparsers'
+    branch: 'master'
+    mvn-settings: 'modeling-toscaparsers-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index dce818193..2cf74957e 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -24,3 +24,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: msb-apigateway-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'msb/apigateway'
+    project-name: 'msb-apigateway'
+    branch: 'master'
+    mvn-settings: 'msb-apigateway-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index a3cc0d947..3df0f0380 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -23,3 +23,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: msb-discovery-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'msb/discovery'
+    project-name: 'msb-discovery'
+    branch: 'master'
+    mvn-settings: 'msb-discovery-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index b036e8150..b69357b1c 100644
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -18,3 +18,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: msb-java-sdk-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'msb/java-sdk'
+    project-name: 'msb-java-sdk'
+    branch: 'master'
+    mvn-settings: 'msb-java-sdk-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index fbae343fd..fedeba4bd 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -22,3 +22,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: msb-swagger-sdk-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'msb/swagger-sdk'
+    project-name: 'msb-swagger-sdk'
+    branch: 'master'
+    mvn-settings: 'msb-swagger-sdk-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index ab979e636..c619ff1ff 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -25,3 +25,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: multicloud-framework-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'multicloud/framework'
+    project-name: 'multicloud-framework'
+    branch: 'master'
+    mvn-settings: 'multicloud-framework-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 4fea8c5f1..bb83c93ee 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -25,3 +25,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: multicloud-openstack-vmware-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'multicloud/openstack/vmware'
+    project-name: 'multicloud-openstack-vmware'
+    branch: 'master'
+    mvn-settings: 'multicloud-openstack-vmware-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 410fd75e6..018e15bb0 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -39,3 +39,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-memcached-4c-4g'
+- project:
+    name: multicloud-openstack-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'multicloud/openstack'
+    project-name: 'multicloud-openstack'
+    branch: 'master'
+    mvn-settings: 'multicloud-openstack-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index 3f2088cd2..0f7d24a8c 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -21,3 +21,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: oom-registrator-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'oom/registrator'
+    project-name: 'oom-registrator'
+    branch: 'master'
+    mvn-settings: 'oom-registrator-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index ff6c9dc72..5fb4d14f6 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -23,3 +23,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: oparent-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'oparent'
+    project-name: 'oparent'
+    branch: 'master'
+    mvn-settings: 'oparent-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 131695e6f..47806918d 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -20,3 +20,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: policy-api-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'policy/api'
+    project-name: 'policy-api'
+    branch: 'master'
+    mvn-settings: 'policy-api-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index a844d05e9..0f9d22146 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -41,3 +41,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: policy-common-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'policy/common'
+    project-name: 'policy-common'
+    branch: 'master'
+    mvn-settings: 'policy-common-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index f463a2cef..89a543362 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -41,3 +41,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-basebuild-4c-4g'
+- project:
+    name: policy-drools-applications-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'policy/drools-applications'
+    project-name: 'policy-drools-applications'
+    branch: 'master'
+    mvn-settings: 'policy-drools-applications-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index ada359f0f..3c0965d17 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -42,3 +42,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-basebuild-4c-4g'
+- project:
+    name: policy-drools-pdp-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'policy/drools-pdp'
+    project-name: 'policy-drools-pdp'
+    branch: 'master'
+    mvn-settings: 'policy-drools-pdp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index ceb228eca..29b12a6eb 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -42,3 +42,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-basebuild-4c-4g'
+- project:
+    name: policy-engine-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'policy/engine'
+    project-name: 'policy-engine'
+    branch: 'master'
+    mvn-settings: 'policy-engine-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index fb3206a4a..fb4d55cde 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -19,3 +19,14 @@
     mvn-settings: 'policy-gui-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: policy-gui-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'policy/gui'
+    project-name: 'policy-gui'
+    branch: 'master'
+    mvn-settings: 'policy-gui-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index c0407e965..598e15299 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -19,3 +19,14 @@
     mvn-settings: 'policy-pap-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: policy-pap-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'policy/pap'
+    project-name: 'policy-pap'
+    branch: 'master'
+    mvn-settings: 'policy-pap-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
index 31c7b5bff..3d11fd20c 100644
--- a/jjb/policy/policy-pdp.yaml
+++ b/jjb/policy/policy-pdp.yaml
@@ -19,3 +19,14 @@
     mvn-settings: 'policy-pdp-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: policy-pdp-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'policy/pdp'
+    project-name: 'policy-pdp'
+    branch: 'master'
+    mvn-settings: 'policy-pdp-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 6d125fcfe..d82854136 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -20,3 +20,14 @@
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
     maven-deploy-properties: -Dbuild.number=$BUILD_NUMBER
+- project:
+    name: portal-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'portal'
+    project-name: 'portal'
+    branch: 'master'
+    mvn-settings: 'portal-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index 15401d619..c7eb47706 100644
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -23,3 +23,14 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+- project:
+    name: sdc-jtosca-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'sdc/jtosca'
+    project-name: 'sdc-jtosca'
+    branch: 'master'
+    mvn-settings: 'sdc-jtosca-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 946eaf90a..8a7668aa3 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -23,3 +23,14 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+- project:
+    name: sdc-sdc-distribution-client-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'sdc/sdc-distribution-client'
+    project-name: 'sdc-sdc-distribution-client'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-distribution-client-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
index b78cde1a9..db8261fa2 100644
--- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml
+++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
@@ -23,3 +23,14 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+- project:
+    name: sdc-sdc-titan-cassandra-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'sdc/sdc-titan-cassandra'
+    project-name: 'sdc-sdc-titan-cassandra'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-titan-cassandra-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index e1f75ac36..06d308471 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -23,3 +23,14 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+- project:
+    name: sdc-sdc-tosca-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'sdc/sdc-tosca'
+    project-name: 'sdc-sdc-tosca'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-tosca-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 139ac95fa..9b9c8a956 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -23,3 +23,14 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: sdc-sdc-workflow-designer-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'sdc/sdc-workflow-designer'
+    project-name: 'sdc-sdc-workflow-designer'
+    branch: 'master'
+    mvn-settings: 'sdc-sdc-workflow-designer-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 7b66263b4..03dfbe847 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -25,3 +25,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-8c-8g
+- project:
+    name: sdc-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'sdc'
+    project-name: 'sdc'
+    branch: 'master'
+    mvn-settings: 'sdc-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml
index 3a8b5b5c5..1ed2bc3b8 100644
--- a/jjb/sdnc/sdnc-adaptors.yaml
+++ b/jjb/sdnc/sdnc-adaptors.yaml
@@ -22,3 +22,14 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: sdc-adaptors-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'sdc/adaptors'
+    project-name: 'sdc-adaptors'
+    branch: 'master'
+    mvn-settings: 'sdc-adaptors-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml
index 17ee14fd2..b0c8b373e 100644
--- a/jjb/sdnc/sdnc-core.yaml
+++ b/jjb/sdnc/sdnc-core.yaml
@@ -30,3 +30,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-2g
+- project:
+    name: sdc-core-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'sdc/core'
+    project-name: 'sdc-core'
+    branch: 'master'
+    mvn-settings: 'sdc-core-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index e78d50b53..74e16505f 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -25,3 +25,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: sdc-northbound-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'sdc/northbound'
+    project-name: 'sdc-northbound'
+    branch: 'master'
+    mvn-settings: 'sdc-northbound-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 487ab04cc..8342e6b11 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -23,3 +23,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: sdc-oam-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'sdc/oam'
+    project-name: 'sdc-oam'
+    branch: 'master'
+    mvn-settings: 'sdc-oam-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml
index 1e62e70cd..5cabc0331 100644
--- a/jjb/sdnc/sdnc-plugins.yaml
+++ b/jjb/sdnc/sdnc-plugins.yaml
@@ -22,3 +22,14 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: sdc-plugins-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'sdc/plugins'
+    project-name: 'sdc-plugins'
+    branch: 'master'
+    mvn-settings: 'sdc-plugins-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index a21dd29d4..74d7d6a5f 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -26,3 +26,14 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+- project:
+    name: so-libs-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'so/libs'
+    project-name: 'so-libs'
+    branch: 'master'
+    mvn-settings: 'so-libs-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index dbc4f2185..50af632d6 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -33,3 +33,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: so-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'so'
+    project-name: 'so'
+    branch: 'master'
+    mvn-settings: 'so-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml
index 9f7d0f785..334513236 100644
--- a/jjb/ui/ui-dmaapbc.yaml
+++ b/jjb/ui/ui-dmaapbc.yaml
@@ -23,3 +23,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: ui-dmaapbc-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'ui/dmaapbc'
+    project-name: 'ui-dmaapbc'
+    branch: 'master'
+    mvn-settings: 'ui-dmaapbc-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index 55e851bb4..880412bd0 100644
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -20,3 +20,14 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: usecase-ui-server-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'usecase-ui/server'
+    project-name: 'usecase-ui-server'
+    branch: 'master'
+    mvn-settings: 'usecase-ui-server-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index 3bb7d1fb3..c4d08499f 100644
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -20,3 +20,14 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: usecase-ui-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'usecase-ui'
+    project-name: 'usecase-ui'
+    branch: 'master'
+    mvn-settings: 'usecase-ui-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 0d39d877c..4018d1668 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -28,3 +28,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-gvnfm-vnflcm-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vfc/gvnfm/vnflcm'
+    project-name: 'vfc-gvnfm-vnflcm'
+    branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnflcm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index d3dbdd0e5..ff659393a 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -27,3 +27,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-gvnfm-vnfmgr-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vfc/gvnfm/vnfmgr'
+    project-name: 'vfc-gvnfm-vnfmgr'
+    branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index bc84f2c9f..462abe47e 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -28,3 +28,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-gvnfm-vnfres-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vfc/gvnfm/vnfres'
+    project-name: 'vfc-gvnfm-vnfres'
+    branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnfres-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index 8de899203..a10549aa3 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -29,3 +29,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
+- project:
+    name: vfc-nfvo-catalog-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vfc/nfvo/catalog'
+    project-name: 'vfc-nfvo-catalog'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-catalog-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index fb0f5046f..015a9fe9b 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -1,30 +1,41 @@
----

-

-- project:

-    name: vfc-nfvo-driver-ems-java

-    project-name: 'vfc-nfvo-driver-ems'

-    project: 'vfc/nfvo/driver/ems'

-    stream:

-      - 'master':

-          branch: 'master'

+---
+
+- project:
+    name: vfc-nfvo-driver-ems-java
+    project-name: 'vfc-nfvo-driver-ems'
+    project: 'vfc/nfvo/driver/ems'
+    stream:
+      - 'master':
+          branch: 'master'
       - 'amsterdam':
           branch: 'amsterdam'
-    mvn-settings: 'vfc-nfvo-driver-ems-settings'

-    subproject:

-      - 'drv-ems-boco':

-          pom: 'ems/pom.xml'

-          pattern: 'ems/**'

-    jobs:

+    mvn-settings: 'vfc-nfvo-driver-ems-settings'
+    subproject:
+      - 'drv-ems-boco':
+          pom: 'ems/pom.xml'
+          pattern: 'ems/**'
+    jobs:
       - gerrit-maven-clm:
           java-version: ''
-      - '{project-name}-{stream}-{subproject}-verify-java'

-      - '{project-name}-{stream}-{subproject}-merge-java'

-      - '{project-name}-{stream}-release-version-java-daily'

-      - '{project-name}-{stream}-docker-java-version-shell-daily':

-          docker-pom: 'pom.xml'

-          mvn-goals: 'install'

-          script:

-            !include-raw-escape: 'build-driver-ems-docker-image.sh'

-    files: '**'

-    archive-artifacts: ''

+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-driver-ems-docker-image.sh'
+    files: '**'
+    archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-driver-ems-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vfc/nfvo/driver/ems'
+    project-name: 'vfc-nfvo-driver-ems'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-ems-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index a7fa3a849..de72fbfa4 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -27,3 +27,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-driver-sfc-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vfc/nfvo/driver/sfc'
+    project-name: 'vfc-nfvo-driver-sfc'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-sfc-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 71941e82e..e9124da9f 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -20,3 +20,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-driver-svnfm-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vfc/nfvo/driver/svnfm'
+    project-name: 'vfc-nfvo-driver-svnfm'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-svnfm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index d91e4d854..32b629758 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -28,3 +28,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-driver-vnfm-gvnfm-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vfc/nfvo/driver/vnfm/gvnfm'
+    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
index 2e3642fd9..98e62badd 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -23,3 +23,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-driver-vnfm-svnfm-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vfc/nfvo/driver/vnfm/svnfm'
+    project-name: 'vfc-nfvo-driver-vnfm-svnfm'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 85812b0cc..5389d5f6b 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -24,3 +24,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-lcm-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vfc/nfvo/lcm'
+    project-name: 'vfc-nfvo-lcm'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-lcm-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index b690f50da..15eb53e82 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -22,3 +22,14 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh'
+- project:
+    name: vfc-nfvo-resmanagement-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vfc/nfvo/resmanagement'
+    project-name: 'vfc-nfvo-resmanagement'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-resmanagement-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index fb48ce0c3..d65245656 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -32,3 +32,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-wfengine-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vfc/nfvo/wfengine'
+    project-name: 'vfc-nfvo-wfengine'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-wfengine-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vid/vid-asdcclient.yaml b/jjb/vid/vid-asdcclient.yaml
index 6069ec0cd..77115a1aa 100644
--- a/jjb/vid/vid-asdcclient.yaml
+++ b/jjb/vid/vid-asdcclient.yaml
@@ -18,3 +18,14 @@
     mvn-settings: 'vid-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: vid-asdcclient-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vid/asdcclient'
+    project-name: 'vid-asdcclient'
+    branch: 'master'
+    mvn-settings: 'vid-asdcclient-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 4af5f3e88..eb6f68dae 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -26,3 +26,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vid-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vid'
+    project-name: 'vid'
+    branch: 'master'
+    mvn-settings: 'vid-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vnfsdk/vnfsdk-compliance.yaml b/jjb/vnfsdk/vnfsdk-compliance.yaml
index f61ab6e60..9928dabbb 100644
--- a/jjb/vnfsdk/vnfsdk-compliance.yaml
+++ b/jjb/vnfsdk/vnfsdk-compliance.yaml
@@ -29,3 +29,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vnfsdk-compliance-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vnfsdk/compliance'
+    project-name: 'vnfsdk-compliance'
+    branch: 'master'
+    mvn-settings: 'vnfsdk-compliance-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 6ff0a587a..e85e6f912 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -26,3 +26,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vnfsdk-refrepo-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vnfsdk/refrepo'
+    project-name: 'vnfsdk-refrepo'
+    branch: 'master'
+    mvn-settings: 'vnfsdk-refrepo-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 1d2855631..a6854058c 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -17,3 +17,14 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vnfsdk-validation-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vnfsdk/validation'
+    project-name: 'vnfsdk-validation'
+    branch: 'master'
+    mvn-settings: 'vnfsdk-validation-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml
index db77aa094..6c6fe9b33 100644
--- a/jjb/vvp/vvp-jenkins.yaml
+++ b/jjb/vvp/vvp-jenkins.yaml
@@ -20,3 +20,14 @@
       - '{project-name}-{stream}-docker-java-daily'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
+- project:
+    name: vvp-jenkins-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vvp/jenkins'
+    project-name: 'vvp-jenkins'
+    branch: 'master'
+    mvn-settings: 'vvp-jenkins-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file