From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 24 Jul 2020 17:45:40 +0000 (+0200)
Subject: Revert "Build infrautils with maven-3.6"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7e88ce04d815cb4bea6539dd3819db6571decd7a;hp=-c;p=releng%2Fbuilder.git

Revert "Build infrautils with maven-3.6"

This reverts commit bbe9de2506c6c0ab705b4b2926ef8824e5eba24e, as
it seems distcheck/javadoc-verify jobs have trouble running with it.

Change-Id: Id83030fefae9f2517eb438a45e537fbeb5a80fa7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

7e88ce04d815cb4bea6539dd3819db6571decd7a
diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 97a950be70..b7cb017039 100644
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -21,7 +21,6 @@
     branch: 'master'
     java-version: 'openjdk11'
     mvn-settings: 'infrautils-settings'
-    mvn-version: mvn36
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'