Refactoring CCSDK Jobs to run with mvn36

Issue-ID: CIMAN-386
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ic437d59da61afc8740767e141d7b89135cbccf47

12 files changed, 53 insertions, 47 deletions

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 20a246627..eaa95f42e 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -21,7 +21,6 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn36"
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -32,6 +31,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -40,7 +40,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -59,10 +58,10 @@
     project: 'ccsdk/apps'
     project-name: 'ccsdk-apps'
     branch: 'master'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn36"
 
 - project:
     name: ccsdk-apps-clm
@@ -76,8 +75,8 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
-    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
 
 #- project:
@@ -111,6 +110,7 @@
     project-name: ccsdk-apps
     jobs:
       - gerrit-whitesource-scan
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index fd25f149e..971356d61 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -16,7 +16,6 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn36"
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
@@ -25,11 +24,11 @@
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-oran-settings'
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
-    java-version: openjdk11
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1804-docker-8c-8g
@@ -58,8 +57,8 @@
     project: 'ccsdk/oran'
     project-name: 'ccsdk-oran'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-oran-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn36"
-    java-version: openjdk11
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 682ee7ca8..f466a168b 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -29,6 +29,8 @@
           branch: 'elalto'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -37,8 +39,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    mvn-version: "mvn36"
-    java-version: openjdk11
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -57,11 +57,11 @@
     project: 'ccsdk/cds'
     project-name: 'ccsdk-cds'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: "mvn36"
-    java-version: openjdk11
 
 - project:
     name: ccsdk-cds-clm
@@ -75,9 +75,9 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
-    mvn-settings: 'ccsdk-cds-settings'
-    mvn-version: "mvn36"
     java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'ccsdk-cds-settings'
     build-node: ubuntu1804-builder-4c-4g
 
 
@@ -95,10 +95,10 @@
     project-name: ccsdk-cds
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
     project: ccsdk/cds
     branch: master
-    mvn-version: "mvn36"
-    java-version: openjdk11
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 317c55101..6447d1afc 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -16,7 +16,6 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn36"
           maven-versions-plugin: true
           cron: '@daily'
 
@@ -24,6 +23,8 @@
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-dashboard-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -32,14 +33,12 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    java-version: openjdk11
     build-node: ubuntu1804-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-dashboard-sonar
-    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -52,6 +51,8 @@
     project: 'ccsdk/dashboard'
     project-name: 'ccsdk-dashboard'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-dashboard-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -63,10 +64,11 @@
     nexus-iq-namespace: 'onap-'
     project: 'ccsdk/dashboard'
     project-name: 'ccsdk-dashboard'
-    java-version: openjdk11
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-dashboard-settings'
     build-node: centos7-redis-4c-4g
 
@@ -84,9 +86,10 @@
     project-name: ccsdk-dashboard
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-dashboard-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
     project: ccsdk/dashboard
     branch: master
-    java-version: openjdk11
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 760e127a9..ae461591f 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -16,7 +16,6 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn36"
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
@@ -29,10 +28,10 @@
           branch: 'elalto'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1804-docker-8c-8g
@@ -69,6 +68,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     build-node: ubuntu1804-docker-8c-8g
 
@@ -89,6 +89,7 @@
     jobs:
       - gerrit-whitesource-scan:
           java-opts: '-Xmx2048m'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 06e4a5597..f6606ab1a 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -19,6 +19,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -27,7 +28,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
@@ -47,10 +47,10 @@
     project: 'ccsdk/features'
     project-name: 'ccsdk-features'
     branch: 'master'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    maven-version: "mvn36"
 
 - project:
     name: ccsdk-features-clm
@@ -64,9 +64,9 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -84,6 +84,7 @@
     project-name: ccsdk-features
     jobs:
       - gerrit-whitesource-scan
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 7b716f729..06166e014 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -21,6 +21,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -29,7 +30,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
 
 - project:
     name: ccsdk-parent-clm
@@ -43,11 +43,10 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
-    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-parent-info
     project-name: ccsdk-parent
@@ -62,6 +61,7 @@
     project-name: ccsdk-parent
     jobs:
       - gerrit-whitesource-scan
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 012df50af..5d03a380c 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -22,6 +22,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -30,7 +31,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -49,10 +49,10 @@
     project: 'ccsdk/sli/adaptors'
     project-name: 'ccsdk-sli-adaptors'
     branch: 'master'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn36"
 
 - project:
     name: ccsdk-sli-adaptors-clm
@@ -66,11 +66,10 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
-    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-sli-adaptors-info
     project-name: ccsdk-sli-adaptors
@@ -86,6 +85,7 @@
     project-name: ccsdk-sli-adaptors
     jobs:
       - gerrit-whitesource-scan
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index e6169e975..ffe9ca15f 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -22,6 +22,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-core-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -30,7 +31,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -49,10 +49,10 @@
     project: 'ccsdk/sli/core'
     project-name: 'ccsdk-sli-core'
     branch: 'master'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-core-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn36"
 
 - project:
     name: ccsdk-sli-core-clm
@@ -66,11 +66,10 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-core-settings'
-    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-sli-core-info
     project-name: ccsdk-sli-core
@@ -85,6 +84,7 @@
     project-name: ccsdk-sli-core
     jobs:
       - gerrit-whitesource-scan
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-core-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 45761e5a9..bcc011d15 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -22,6 +22,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -30,7 +31,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -49,10 +49,10 @@
     project: 'ccsdk/sli/northbound'
     project-name: 'ccsdk-sli-northbound'
     branch: 'master'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn36"
 
 - project:
     name: ccsdk-sli-northbound-clm
@@ -66,11 +66,10 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-northbound-settings'
-    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-sli-northbound-info
     project-name: ccsdk-sli-northbound
@@ -85,6 +84,7 @@
     project-name: ccsdk-sli-northbound
     jobs:
       - gerrit-whitesource-scan
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index a6d1cd4fc..4e028f310 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -22,6 +22,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-plugins-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -30,7 +31,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -49,10 +49,10 @@
     project: 'ccsdk/sli/plugins'
     project-name: 'ccsdk-sli-plugins'
     branch: 'master'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-plugins-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn36"
 
 - project:
     name: ccsdk-sli-plugins-clm
@@ -66,9 +66,8 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-plugins-settings'
-    maven-version: "mvn36"
-
 
 - project:
     name: ccsdk-sli-plugins-info
@@ -84,6 +83,7 @@
     project-name: ccsdk-sli-plugins
     jobs:
       - gerrit-whitesource-scan
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-plugins-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index 3486a30d5..e2f8a7f2f 100644
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -17,6 +17,7 @@
     stream:
       - 'master':
           branch: 'master'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-utils-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -38,9 +39,9 @@
     stream:
       - 'master':
           branch: 'master'
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-utils-settings'
 
-
 - project:
     name: ccsdk-utils-info
     project-name: ccsdk-utils
@@ -55,6 +56,7 @@
     project-name: ccsdk-utils
     jobs:
       - gerrit-whitesource-scan
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-utils-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true