From 6329a7b77ee99529c6b486029f14b3e3f01f00a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Andr=C3=A9n?= <johan@markatta.com>
Date: Tue, 30 Oct 2018 10:51:30 +0100
Subject: [PATCH] Ignore vendor when selecting JVMs  #25835

---
 .../src/test/scala/akka/stream/scaladsl/FlowPrependSpec.scala | 2 +-
 project/CrossJava.scala                                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrependSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrependSpec.scala
index 58ff9e883f..1f19d5fe48 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrependSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrependSpec.scala
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2016-2018 Lightbend Inc. <https://www.lightbend.com>
  */
 
diff --git a/project/CrossJava.scala b/project/CrossJava.scala
index 78867f12bf..82ff180b67 100644
--- a/project/CrossJava.scala
+++ b/project/CrossJava.scala
@@ -135,8 +135,8 @@ object CrossJava {
       def javaHomes: Vector[(String, File)] =
         wrapNull(base.list())
           .collect {
-            case dir@JavaHomeDir(vendor, m, n) =>
-              val v = JavaVersion(nullBlank(m) + n).withVendor(vendor).toString
+            case dir@JavaHomeDir(_, m, n) =>
+              val v = JavaVersion(nullBlank(m) + n).toString
               if ((base / dir / "Contents" / "Home").exists) v -> (base / dir / "Contents" / "Home")
               else v -> (base / dir)
           }