Refactoring CCSDK Jobs to run with mvn36

[ci-management.git] / jjb / ccsdk / cds.yaml

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 682ee7c..f466a16 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -29,6 +29,8 @@
           branch: 'elalto'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -37,8 +39,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    mvn-version: "mvn36"
-    java-version: openjdk11
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -57,11 +57,11 @@
     project: 'ccsdk/cds'
     project-name: 'ccsdk-cds'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: "mvn36"
-    java-version: openjdk11
 
 - project:
     name: ccsdk-cds-clm
@@ -75,9 +75,9 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
-    mvn-settings: 'ccsdk-cds-settings'
-    mvn-version: "mvn36"
     java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'ccsdk-cds-settings'
     build-node: ubuntu1804-builder-4c-4g
 
 
@@ -95,10 +95,10 @@
     project-name: ccsdk-cds
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
     project: ccsdk/cds
     branch: master
-    mvn-version: "mvn36"
-    java-version: openjdk11