From 4851f399d4b25f76eeb494d7c63844bf6b858fd5 Mon Sep 17 00:00:00 2001
From: Chris Hostetter <hossman@apache.org>
Date: Wed, 1 Mar 2017 13:48:52 -0700
Subject: [PATCH] SOLR-10219: stop defaulting to tests.disableHdfs=true under
 java9

---
 dev-tools/maven/solr/pom.xml.template | 9 ---------
 solr/common-build.xml                 | 9 +++------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/dev-tools/maven/solr/pom.xml.template b/dev-tools/maven/solr/pom.xml.template
index 956b5049b2d..c90d684f86f 100644
--- a/dev-tools/maven/solr/pom.xml.template
+++ b/dev-tools/maven/solr/pom.xml.template
@@ -173,15 +173,6 @@
     </plugins>
   </build>
   <profiles>
-    <profile>
-      <id>java9-tests-disableHdfs</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <properties>
-        <tests.disableHdfs>true</tests.disableHdfs>
-      </properties>
-    </profile>
     <profile>
       <id>windows-tests-disableHdfs</id>
       <activation>
diff --git a/solr/common-build.xml b/solr/common-build.xml
index 5e8976ca9ff..3b459e7ae2d 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -151,14 +151,11 @@
   </macrodef>
 
   <!-- 
-    We don't want to run HDFS tests on Windows, because they require Cygwin.
-    We don't want to run HDFS tests on Java 9 Jigsaw, because Hadoop/HDFS is completely broken with Java's module system.
+    We don't want to run HDFS tests on Windows by default, because they require Cygwin.
+    Cygwin users can explicitly set -Dtests.disableHdfs=false to enable Hdfs related testing.
   -->
   <condition property="tests.disableHdfs" value="true">
-    <or>
-      <os family="windows"/>
-      <available classname="java.lang.reflect.Module"/>
-    </or>
+    <os family="windows"/>
   </condition>
 
   <target name="validate" depends="compile-tools">