From 4b2867cc21c6455e3d72776079b38411a3760695 Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Sat, 10 Jul 2021 00:12:17 +0100
Subject: Revert "[SDC] Update maven to 3.6"

This reverts commit a6785bf4

Change-Id: I4a2c1326cb4bce41a20afc416bfa9d3430869810
Issue-ID: CIMAN-406
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
---
 jjb/sdc/sdc-csit.yaml                    | 2 +-
 jjb/sdc/sdc-onap-ui-angular.yaml         | 2 +-
 jjb/sdc/sdc-onap-ui-common.yaml          | 2 +-
 jjb/sdc/sdc-sdc-be-common.yaml           | 2 +-
 jjb/sdc/sdc-sdc-distribution-client.yaml | 4 ++--
 jjb/sdc/sdc-sdc-docker-base.yaml         | 2 +-
 jjb/sdc/sdc-sdc-pubsub.yaml              | 2 +-
 jjb/sdc/sdc-sdc-tosca.yaml               | 2 +-
 jjb/sdc/sdc-sdc-workflow-designer.yaml   | 2 +-
 jjb/sdc/sdc.yaml                         | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'jjb/sdc')

diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 714aa7712..c053518bf 100644
--- 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-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml
index beaa4c141..5de765080 100644
--- a/jjb/sdc/sdc-onap-ui-angular.yaml
+++ b/jjb/sdc/sdc-onap-ui-angular.yaml
@@ -30,7 +30,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    mvn-version: 'mvn36'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-onap-ui-angular-sonar
diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml
index 5d8734812..9016a5f3c 100644
--- a/jjb/sdc/sdc-onap-ui-common.yaml
+++ b/jjb/sdc/sdc-onap-ui-common.yaml
@@ -24,7 +24,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    mvn-version: 'mvn36'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-onap-ui-common-sonar
diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index 4f0c9c553..4901bf4c9 100644
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -27,7 +27,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    mvn-version: 'mvn36'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-be-common-sonar
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 6bf7795b2..78a34d3fd 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -30,7 +30,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    mvn-version: 'mvn36'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-distribution-client-integration-pairwise
@@ -48,7 +48,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    mvn-version: 'mvn36'
+    maven-version: 'mvn36'
     mvn-params: ' -P integration-pairwise'
 
 - project:
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index e6b4c2617..e62163687 100644
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -29,7 +29,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
-    mvn-version: 'mvn36'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-docker-base-info
diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index 337361257..a8af3d565 100644
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -24,7 +24,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    mvn-version: 'mvn36'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-pubsub-sonar
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index 7730967a7..3ff5c7555 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -28,7 +28,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    mvn-version: 'mvn36'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-tosca-sonar
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index fa8c83abf..b42f1fcde 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -36,7 +36,7 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1804-builder-4c-4g
-    mvn-version: 'mvn36'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-workflow-designer-sonar
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 95b8c7282..1544facc0 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -73,7 +73,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
-    mvn-version: 'mvn36'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sonar
-- 
cgit 1.2.3-korg