From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Mon, 24 Aug 2020 16:47:44 +0000 (+0000)
Subject: Merge "Update maven3.5 to 3.6. Part of JDK11 migration"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f708e807cf4e8ecbad7ad0ba2e90cebdfa3d0ec3;hp=-c;p=ci-management.git

Merge "Update maven3.5 to 3.6. Part of JDK11 migration"
---

f708e807cf4e8ecbad7ad0ba2e90cebdfa3d0ec3
diff --combined jjb/ccsdk/dashboard.yaml
index b2ab4577c,23c802e13..317c55101
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@@ -16,7 -16,7 +16,7 @@@
            container-public-registry: 'nexus3.onap.org:10001'
            container-staging-registry: 'nexus3.onap.org:10003'
            mvn-params: '-Dmaven.test.skip=true -P docker'
-           maven-version: "mvn35"
+           maven-version: "mvn36"
            maven-versions-plugin: true
            cron: '@daily'
  
@@@ -32,14 -32,12 +32,14 @@@
        deployAtEnd=true
      files: '**'
      archive-artifacts: ''
 +    java-version: openjdk11
      build-node: ubuntu1804-docker-8c-8g
      mvn-snapshot-id: 'ecomp-snapshots'
      nexus-snapshot-repo: 'snapshots'
  
  - project:
      name: ccsdk-dashboard-sonar
 +    java-version: openjdk11
      jobs:
        - gerrit-maven-sonar
      sonarcloud: true
@@@ -63,7 -61,6 +63,7 @@@
      nexus-iq-namespace: 'onap-'
      project: 'ccsdk/dashboard'
      project-name: 'ccsdk-dashboard'
 +    java-version: openjdk11
      stream:
        - 'master':
            branch: 'master'
@@@ -89,4 -86,3 +89,4 @@@
      mvn-clean-install: true
      project: ccsdk/dashboard
      branch: master
 +    java-version: openjdk11