Merge "Force maven version 3.5"

8 files changed, 25 insertions, 0 deletions

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 699585040..805332764 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -30,6 +30,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
@@ -44,6 +45,7 @@
     mvn-settings: 'ccsdk-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-apps-clm
@@ -58,6 +60,7 @@
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-apps-settings'
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
@@ -77,6 +80,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
+    maven-version: "mvn35"
     build-node: queue-docker-4c-4g
 #
 #- project:
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 421785491..70c4edc2b 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -24,6 +24,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
@@ -38,6 +39,7 @@
     mvn-settings: 'ccsdk-cds-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-cds-clm
@@ -52,6 +54,7 @@
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-cds-settings'
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
@@ -71,6 +74,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
+    maven-version: "mvn35"
     build-node: queue-docker-4c-4g
 
 - project:
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index a9ef4b494..0e6406fd5 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -24,6 +24,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
@@ -38,6 +39,7 @@
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-features-clm
@@ -52,6 +54,7 @@
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-features-settings'
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index bdfa9a333..81a60a64c 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -24,6 +24,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-parent-clm
@@ -38,6 +39,7 @@
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-parent-settings'
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index cbc35eae6..9979e94a5 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -24,6 +24,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
@@ -38,6 +39,7 @@
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-adaptors-clm
@@ -52,6 +54,7 @@
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 3f17f54dc..2a34eb013 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -24,6 +24,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
@@ -38,6 +39,7 @@
     mvn-settings: 'ccsdk-sli-core-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-core-clm
@@ -52,6 +54,7 @@
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-sli-core-settings'
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 73b9a125b..7095c741b 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -24,6 +24,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
@@ -38,6 +39,7 @@
     mvn-settings: 'ccsdk-sli-northbound-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-northbound-clm
@@ -52,6 +54,7 @@
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-sli-northbound-settings'
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 81efcaf6a..958baf727 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -24,6 +24,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-plugins-sonar
@@ -37,6 +38,7 @@
     mvn-settings: 'ccsdk-sli-plugins-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-plugins-clm
@@ -51,6 +53,7 @@
       - 'dublin':
           branch: 'dublin'
     mvn-settings: 'ccsdk-sli-plugins-settings'
+    maven-version: "mvn35"
 
 
 - project: