diff --git a/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb b/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb
index a6cbdd6bf3..e10575e0cf 100644
--- a/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb
+++ b/Library/Homebrew/cask/lib/hbc/dsl/caveats.rb
@@ -90,7 +90,7 @@ module Hbc
 
               brew cask install java
           EOS
-        elsif java_version.include?("9") || java_version.include?("+")
+        elsif java_version.include?("10") || java_version.include?("+")
           <<~EOS
             #{@cask} requires Java #{java_version}. You can install the latest version with
 
diff --git a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb
index 2a48f02bd8..b8cf502a5e 100644
--- a/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb
+++ b/Library/Homebrew/extend/os/mac/requirements/java_requirement.rb
@@ -5,10 +5,10 @@ class JavaRequirement < Requirement
   end
 
   # A strict Java 8 requirement (1.8) should prompt the user to install
-  # the legacy java8 cask because the current version, Java 9, is not
-  # completely backwards compatible, and contains breaking changes such as
+  # the legacy java8 cask because versions newer than Java 8 are not
+  # completely backwards compatible, and contain breaking changes such as
   # strong encapsulation of JDK-internal APIs and a modified version scheme
-  # (9.0 not 1.9).
+  # (*.0 not 1.*).
   def cask
     if @version.nil? || @version.to_s.end_with?("+") ||
        @version.to_f >= JAVA_CASK_MAP.keys.max.to_f
@@ -22,7 +22,7 @@ class JavaRequirement < Requirement
 
   JAVA_CASK_MAP = {
     "1.8" => "caskroom/versions/java8",
-    "9.0" => "java",
+    "10.0" => "java",
   }.freeze
 
   def possible_javas