migration to new maven for honeycomb and hc2vpp jobs

 - switch to new version of maven due to build dependencies
   for new JDK11

Change-Id: I1510a87d60a0b64bcb62940585f8a9ef588e4bad
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>

4 files changed, 37 insertions, 37 deletions

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index e23c69454..00befec5d 100644
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -81,7 +81,7 @@
           output-path: 'archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'csit-hc2vpp-verify-perf-{stream}-{os}'
@@ -138,4 +138,4 @@
           output-path: 'archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml
index 6406da484..c64a221a0 100644
--- a/jjb/hc2vpp/hc2vpp-csit.yaml
+++ b/jjb/hc2vpp/hc2vpp-csit.yaml
@@ -101,7 +101,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-csit-verify-{stream}-{os}'
@@ -125,9 +125,9 @@
       - os-parameter:
           os: '{os}'
       - maven-project-parameter:
-          maven: 'mvn33-new'
+          maven: 'mvn36'
       - maven-exec:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - stream-parameter:
           stream: '{stream}'
       - odl-parameter:
@@ -169,7 +169,7 @@
           !include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DskipTests -Dcheckstyle.skip=true'
@@ -194,7 +194,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-csit-integration-odl-{odl}-{stream}-{os}'
@@ -248,7 +248,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-csit-verify-odl-{odl}-{stream}-{os}'
@@ -272,9 +272,9 @@
       - os-parameter:
           os: '{os}'
       - maven-project-parameter:
-          maven: 'mvn33-new'
+          maven: 'mvn36'
       - maven-exec:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - stream-parameter:
           stream: '{stream}'
       - odl-parameter:
@@ -316,7 +316,7 @@
           !include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DskipTests -Dcheckstyle.skip=true'
@@ -341,7 +341,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-csit-perf-{stream}-{os}'
@@ -410,7 +410,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - parameter:
     name: odl-parameter
diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index 321026564..1195e266f 100644
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -77,7 +77,7 @@
           branch: '{branch}'
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge site'
@@ -91,7 +91,7 @@
       - email-notification:
           email-prefix: '[hc2vpp]'
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-verify-image-{stream}-{os}'
@@ -143,7 +143,7 @@
             notbuilt: true
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge'
@@ -157,7 +157,7 @@
       - email-notification:
           email-prefix: '[hc2vpp]'
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-merge-{stream}-{os}'
@@ -177,9 +177,9 @@
       - os-parameter:
           os: '{os}'
       - maven-project-parameter:
-          maven: 'mvn33-new'
+          maven: 'mvn36'
       - maven-exec:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -202,7 +202,7 @@
           branch: '{branch}'
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dsonar -Ddocs.hc.folder=io/fd/hc2vpp -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
@@ -223,7 +223,7 @@
       - email-notification:
         email-prefix: '[hc2vpp]'
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-integration-{stream}-{os}'
@@ -245,9 +245,9 @@
       - stream-parameter:
           stream: '{stream}'
       - maven-project-parameter:
-          maven: 'mvn33-new'
+          maven: 'mvn36'
       - maven-exec:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
       - string:
@@ -287,7 +287,7 @@
       - shell:
           !include-raw-escape: include-raw-hc2vpp-integration-prebuild.sh
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge'
@@ -299,7 +299,7 @@
 
     postbuilders:
       - maven-target:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           goals: '--version'
           settings: 'hc2vpp-settings'
           settings-type: cfp
@@ -327,4 +327,4 @@
           deploy-unstable: false
           release-env-var: SKIP_JAR_DEPLOY
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 2ee68a2f9..a481c5769 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -69,7 +69,7 @@
           branch: '{branch}'
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge site'
@@ -83,7 +83,7 @@
       - email-notification:
           email-prefix: '[honeycomb]'
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'honeycomb-merge-{stream}-{os}'
@@ -103,9 +103,9 @@
       - os-parameter:
           os: '{os}'
       - maven-project-parameter:
-          maven: 'mvn33-new'
+          maven: 'mvn36'
       - maven-exec:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -128,7 +128,7 @@
           branch: '{branch}'
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dsonar site site:deploy'
@@ -140,7 +140,7 @@
 
     postbuilders:
       - maven-target:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           goals: '--version'
           settings: 'honeycomb-settings'
           settings-type: cfp
@@ -165,7 +165,7 @@
           unique-version: true
           deploy-unstable: false
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'honeycomb-benchmark-master-{os}'
@@ -185,9 +185,9 @@
       - os-parameter:
           os: '{os}'
       - maven-project-parameter:
-          maven: 'mvn33-new'
+          maven: 'mvn36'
       - maven-exec:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - repo-name-parameter:
           repo-name: 'master.{repo-os-part}'
 
@@ -207,7 +207,7 @@
       - timed: '@daily'
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Pbenchmark'
@@ -282,4 +282,4 @@
                 exclude: 'simple-container,list-in-container,complex-list-in-container'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'