From 7ac8160e06c8d8571280010e38a797cf8610a92f Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Wed, 16 Sep 2020 14:12:44 +0200
Subject: Fix the merge job

Fix the merge job that does not use jdk 11

Issue-ID: SDC-2725

Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I3bb72a6ca40efa738b7bce16d842c3c6454d6edb
---
 jjb/global-templates-java.yaml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'jjb/global-templates-java.yaml')

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index da5dfdccc..55df274fc 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1090,6 +1090,8 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
-- 
cgit 1.2.3-korg