You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2017/06/28 15:37:42 UTC
lucene-solr:master: Revert "SOLR-10951: Hadoop does not work on Java
9, disable tests that break"
Repository: lucene-solr
Updated Branches:
refs/heads/master b99ee2b13 -> cdc2cc5af
Revert "SOLR-10951: Hadoop does not work on Java 9, disable tests that break"
This reverts commit e43253312f965ba838d80c2000dee761df1f25f5.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cdc2cc5a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cdc2cc5a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cdc2cc5a
Branch: refs/heads/master
Commit: cdc2cc5afa669dd8c97907eff8f9efe6d89ca74b
Parents: b99ee2b
Author: Uwe Schindler <us...@apache.org>
Authored: Wed Jun 28 17:37:29 2017 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Wed Jun 28 17:37:29 2017 +0200
----------------------------------------------------------------------
solr/common-build.xml | 5 +----
.../apache/solr/cloud/TestSolrCloudWithDelegationTokens.java | 3 ---
.../solr/security/hadoop/TestDelegationWithHadoopAuth.java | 1 -
3 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cdc2cc5a/solr/common-build.xml
----------------------------------------------------------------------
diff --git a/solr/common-build.xml b/solr/common-build.xml
index c593de7..3b459e7 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">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cdc2cc5a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java
----------------------------------------------------------------------
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 130118f..ddbbb64 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");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cdc2cc5a/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java
----------------------------------------------------------------------
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 288dfc0..37d9cdf 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"))