From cdc2cc5afa669dd8c97907eff8f9efe6d89ca74b Mon Sep 17 00:00:00 2001
From: Uwe Schindler <uschindler@apache.org>
Date: Wed, 28 Jun 2017 17:37:29 +0200
Subject: [PATCH] Revert "SOLR-10951: Hadoop does not work on Java 9, disable
 tests that break"

This reverts commit e43253312f965ba838d80c2000dee761df1f25f5.
---
 solr/common-build.xml                                        | 5 +----
 .../apache/solr/cloud/TestSolrCloudWithDelegationTokens.java | 3 ---
 .../solr/security/hadoop/TestDelegationWithHadoopAuth.java   | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/solr/common-build.xml b/solr/common-build.xml
index c593de7cb78..3b459e7ae2d 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -155,10 +155,7 @@
     Cygwin users can explicitly set -Dtests.disableHdfs=false to enable Hdfs related testing.
   -->
   <condition property="tests.disableHdfs" value="true">
-    <or>
-      <os family="windows"/>
-      <equals arg1="${build.java.runtime}" arg2="9"/>
-    </or>
+    <os family="windows"/>
   </condition>
 
   <target name="validate" depends="compile-tools">
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java
index 130118f319f..ddbbb649f72 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java
@@ -18,7 +18,6 @@ package org.apache.solr.cloud;
 
 import junit.framework.Assert;
 import org.apache.hadoop.util.Time;
-import org.apache.lucene.util.Constants;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
@@ -63,8 +62,6 @@ public class TestSolrCloudWithDelegationTokens extends SolrTestCaseJ4 {
 
   @BeforeClass
   public static void startup() throws Exception {
-    assumeFalse("SOLR-10951: Hadoop does not work on Java 9", Constants.JRE_IS_MINIMUM_JAVA9);
-    
     System.setProperty("authenticationPlugin", HttpParamDelegationTokenPlugin.class.getName());
     System.setProperty(KerberosPlugin.DELEGATION_TOKEN_ENABLED, "true");
     System.setProperty("solr.kerberos.cookie.domain", "127.0.0.1");
diff --git a/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java b/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java
index 288dfc0f2a3..37d9cdf1a9c 100644
--- a/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java
+++ b/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java
@@ -52,7 +52,6 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {
   @BeforeClass
   public static void setupClass() throws Exception {
     assumeFalse("Hadoop does not work on Windows", Constants.WINDOWS);
-    assumeFalse("SOLR-10951: Hadoop does not work on Java 9", Constants.JRE_IS_MINIMUM_JAVA9);
 
     configureCluster(NUM_SERVERS)// nodes
         .withSecurityJson(TEST_PATH().resolve("security").resolve("hadoop_simple_auth_with_delegation.json"))