From 487d32e16f3e815f448e522765e83804615c3503 Mon Sep 17 00:00:00 2001
From: Christopher Batey <christopher.batey@gmail.com>
Date: Thu, 9 Aug 2018 10:31:29 +0100
Subject: [PATCH] Support discovering jdk-11 (#25445)

This is default directory that it is installed at now and the regex
didn't match it
---
 project/CrossJava.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/CrossJava.scala b/project/CrossJava.scala
index 236734810d..a25ad281f7 100644
--- a/project/CrossJava.scala
+++ b/project/CrossJava.scala
@@ -96,7 +96,7 @@ object CrossJava {
 
   object JavaDiscoverConfig {
     class LinuxDiscoverConfig(base: File) extends JavaDiscoverConf {
-      val JavaHomeDir = """(java-|jdk)(1\.)?([0-9]+).*""".r
+      val JavaHomeDir = """(java-|jdk-?)(1\.)?([0-9]+).*""".r
 
       def javaHomes: Vector[(String, File)] =
         wrapNull(base.list())