Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "SOLR-10951: Hadoop does not work on Java 9, disable tests that break" 

This reverts commit e43253312f.
This commit is contained in:
Uwe Schindler 2017-06-28 17:37:29 +02:00
parent b99ee2b136
commit cdc2cc5afa
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/common-build.xml
View File

@ -155,10 +155,7 @@
Cygwin users can explicitly set -Dtests.disableHdfs=false to enable Hdfs related testing. Cygwin users can explicitly set -Dtests.disableHdfs=false to enable Hdfs related testing.
--> -->
<condition property="tests.disableHdfs" value="true"> <condition property="tests.disableHdfs" value="true">
<or> <os family="windows"/>
<os family="windows"/>
<equals arg1="${build.java.runtime}" arg2="9"/>
</or>
</condition> </condition>
<target name="validate" depends="compile-tools"> <target name="validate" depends="compile-tools">

3
solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java
View File

@ -18,7 +18,6 @@ package org.apache.solr.cloud;
import junit.framework.Assert; import junit.framework.Assert;
import org.apache.hadoop.util.Time; import org.apache.hadoop.util.Time;
import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.impl.CloudSolrClient; import org.apache.solr.client.solrj.impl.CloudSolrClient;
@ -63,8 +62,6 @@ public class TestSolrCloudWithDelegationTokens extends SolrTestCaseJ4 {
@BeforeClass @BeforeClass
public static void startup() throws Exception { 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("authenticationPlugin", HttpParamDelegationTokenPlugin.class.getName());
System.setProperty(KerberosPlugin.DELEGATION_TOKEN_ENABLED, "true"); System.setProperty(KerberosPlugin.DELEGATION_TOKEN_ENABLED, "true");
System.setProperty("solr.kerberos.cookie.domain", "127.0.0.1"); System.setProperty("solr.kerberos.cookie.domain", "127.0.0.1");

1
solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java
View File

@ -52,7 +52,6 @@ public class TestDelegationWithHadoopAuth extends SolrCloudTestCase {
@BeforeClass @BeforeClass
public static void setupClass() throws Exception { public static void setupClass() throws Exception {
assumeFalse("Hadoop does not work on Windows", Constants.WINDOWS); 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 configureCluster(NUM_SERVERS)// nodes
.withSecurityJson(TEST_PATH().resolve("security").resolve("hadoop_simple_auth_with_delegation.json")) .withSecurityJson(TEST_PATH().resolve("security").resolve("hadoop_simple_auth_with_delegation.json"))