From 3f929427efd7b2c0cb9c97ac74755ec185266509 Mon Sep 17 00:00:00 2001
From: Johannes Rudolph <johannes.rudolph@gmail.com>
Date: Thu, 7 Feb 2019 13:39:41 +0100
Subject: [PATCH] build: detect adoptopenjdk java homes (#26337)

The Ubuntu PPA for adoptopenjdk does not strictly follow the Ubuntu Java
naming correctly which can fail the akka build if no other JDK is installed.

rpardini/adoptopenjdk-deb-installer
---
 project/CrossJava.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/CrossJava.scala b/project/CrossJava.scala
index 574b46389f..71cf177b44 100644
--- a/project/CrossJava.scala
+++ b/project/CrossJava.scala
@@ -100,7 +100,7 @@ object CrossJava {
   }
 
   object JavaDiscoverConfig {
-    private val JavaHomeDir = """(java-|jdk-?)(1\.)?([0-9]+).*""".r
+    private val JavaHomeDir = """(java-|jdk-?|adoptopenjdk-)(1\.)?([0-9]+).*""".r
 
     class LinuxDiscoverConfig(base: File) extends JavaDiscoverConf {
       def javaHomes: Vector[(String, File)] =