Update maven3.5 to 3.6. Part of JDK11 migration

commit 1: initial commit
commit 2: rebase (ccsdk-oran)
commit 3: update CDS to openjdk11

Issue-ID: CCSDK-1870

Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
Change-Id: I476f373872e3a1af2e5f04b46b2ab64b4d097722

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index c6c3f56..20a2466 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -21,7 +21,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
+          maven-version: "mvn36"
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -40,7 +40,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -62,7 +62,7 @@
     mvn-settings: 'ccsdk-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
 
 - project:
     name: ccsdk-apps-clm
@@ -77,7 +77,7 @@
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-apps-settings'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
 
 #- project:

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index aea09bb..cc26000 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -16,7 +16,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
+          maven-version: "mvn36"
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
@@ -28,7 +28,7 @@
     mvn-settings: 'ccsdk-oran-settings'
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     java-version: openjdk11
     docker-pom: 'pom.xml'
     mvn-profile: docker
@@ -61,5 +61,5 @@
     mvn-settings: 'ccsdk-oran-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     java-version: openjdk11

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index beb0c17..4afe8ef 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -16,7 +16,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
+          maven-version: "mvn36"
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
@@ -38,7 +38,8 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
+    maven-version: "mvn36"
+    java-version: openjdk11
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -60,7 +61,8 @@
     mvn-settings: 'ccsdk-cds-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
+    java-version: openjdk11
 
 - project:
     name: ccsdk-cds-clm
@@ -75,7 +77,8 @@
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-cds-settings'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
+    java-version: openjdk11
     build-node: ubuntu1804-builder-4c-4g
 
 
@@ -98,3 +101,5 @@
     mvn-clean-install: true
     project: ccsdk/cds
     branch: master
+    maven-version: "mvn36"
+    java-version: openjdk11

diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 353ee2d..23c802e 100644 (file)
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -16,7 +16,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
+          maven-version: "mvn36"
           maven-versions-plugin: true
           cron: '@daily'
 

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 47e616b..760e127 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -16,7 +16,7 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
+          maven-version: "mvn36"
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
@@ -32,7 +32,7 @@
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 17dd0b4..06e4a55 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -27,7 +27,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
@@ -50,7 +50,7 @@
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
 
 - project:
     name: ccsdk-features-clm
@@ -66,7 +66,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-features-settings'
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
 
 - project:

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 0d3a3ee..7b716f7 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -29,7 +29,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
+    maven-version: "mvn36"
 
 - project:
     name: ccsdk-parent-clm
@@ -44,7 +44,7 @@
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-parent-settings'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
 
 

diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index ad92332..012df50 100644 (file)
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -30,7 +30,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -52,7 +52,7 @@
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
 
 - project:
     name: ccsdk-sli-adaptors-clm
@@ -67,7 +67,7 @@
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
 
 

diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 0fc6d6c..e6169e9 100644 (file)
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -30,7 +30,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -52,7 +52,7 @@
     mvn-settings: 'ccsdk-sli-core-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
 
 - project:
     name: ccsdk-sli-core-clm
@@ -67,7 +67,7 @@
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-core-settings'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
 
 

diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index d130cb1..45761e5 100644 (file)
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -30,7 +30,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -52,7 +52,7 @@
     mvn-settings: 'ccsdk-sli-northbound-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
 
 - project:
     name: ccsdk-sli-northbound-clm
@@ -67,7 +67,7 @@
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-northbound-settings'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
 
 

diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 4f99ad8..a6d1cd4 100644 (file)
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -30,7 +30,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -52,7 +52,7 @@
     mvn-settings: 'ccsdk-sli-plugins-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
 
 - project:
     name: ccsdk-sli-plugins-clm
@@ -67,7 +67,7 @@
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-plugins-settings'
-    maven-version: "mvn35"
+    maven-version: "mvn36"
 
 
 - project: