[SDC] Update maven to 3.6

Change-Id: Ie3789fa473809f126ee9be743afe9ebe8078c8cf
Issue-ID: CIMAN-406
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>

diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 714aa77..c053518 100644 (file)
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -24,6 +24,6 @@
           - 'honolulu':
                 branch: 'honolulu'
       java-version: openjdk11
-      mvn-version: 'mvn36'
+      maven-version: 'mvn36'
       mvn-settings: 'sdc-settings'
       mvn-global-settings: global-settings

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index a40e240..bd12fb3 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -69,33 +69,12 @@
       - 'honolulu':
           branch: 'honolulu'
           java-version: openjdk11
-#     - 'frankfurt':
-#         branch: 'frankfurt'
-#         java-version: openjdk8
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
     maven-version: 'mvn36'
 
-#- project:
-#    name: sdc-arm64
-#    project-name: 'sdc-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
-#    project: 'sdc'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    maven-version: 'mvn35'
-#
 - project:
     name: sdc-sonar
     jobs:
@@ -116,6 +95,7 @@
     mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-clm
@@ -129,6 +109,7 @@
     project-name: 'sdc'
     build-node: ubuntu1804-docker-8c-8g
     branch: 'master'
+    maven-version: 'mvn36'
     mvn-settings: 'sdc-settings'
     java-version: openjdk11