From 4889ec7ca64c59ed4fd4fae58d97c68cdc91434e Mon Sep 17 00:00:00 2001
From: Juan Ibiapina <juanibiapina@gmail.com>
Date: Mon, 9 Oct 2017 12:54:13 +0200
Subject: [PATCH] Relax java version regexp

This allows the java version to be specified as "9", instead of "1.9".

Closes #1135
---
 bin/ruby-build  |  2 +-
 test/build.bats | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/bin/ruby-build b/bin/ruby-build
index 7c1c1662..1902a520 100755
--- a/bin/ruby-build
+++ b/bin/ruby-build
@@ -773,7 +773,7 @@ fix_rbx_irb() {
 
 require_java7() {
   local version="$(java -version 2>&1 | grep '\(java\|openjdk\) version' | head -1)"
-  if [[ $version != *1.[789]* ]]; then
+  if [[ $version != *[789]* ]]; then
     colorize 1 "ERROR" >&3
     echo ": Java 7 required. Please install a 1.7-compatible JRE." >&3
     return 1
diff --git a/test/build.bats b/test/build.bats
index 9a95015b..525237b0 100755
--- a/test/build.bats
+++ b/test/build.bats
@@ -622,6 +622,18 @@ DEF
   assert_success
 }
 
+@test "JRuby Java 9 version string" {
+  cached_tarball "jruby-9000.dev" bin/jruby
+
+  stub java '-version : echo java version "9" >&2'
+
+  run_inline_definition <<DEF
+require_java7
+install_package "jruby-9000.dev" "http://ci.jruby.org/jruby-dist-9000.dev-bin.tar.gz" jruby
+DEF
+  assert_success
+}
+
 @test "non-writable TMPDIR aborts build" {
   export TMPDIR="${TMP}/build"
   mkdir -p "$TMPDIR"