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/24 13:35:16 UTC
lucene-solr:master: SOLR-10951: Hadoop does not work on Java 9,
disable tests that break
Repository: lucene-solr
Updated Branches:
refs/heads/master f7b8cc7be -> e43253312
SOLR-10951: Hadoop does not work on Java 9, disable tests that break
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e4325331
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e4325331
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e4325331
Branch: refs/heads/master
Commit: e43253312f965ba838d80c2000dee761df1f25f5
Parents: f7b8cc7
Author: Uwe Schindler <us...@apache.org>
Authored: Sat Jun 24 15:35:00 2017 +0200
Committer: Uwe Schindler <us...@apache.org>
Committed: Sat Jun 24 15:35:00 2017 +0200
----------------------------------------------------------------------
solr/common-build.xml | 5 ++++-
.../apache/solr/cloud/TestSolrCloudWithDelegationTokens.java | 3 +++
.../solr/security/hadoop/TestDelegationWithHadoopAuth.java | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e4325331/solr/common-build.xml
----------------------------------------------------------------------
diff --git a/solr/common-build.xml b/solr/common-build.xml
index 3b459e7..c593de7 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -155,7 +155,10 @@
Cygwin users can explicitly set -Dtests.disableHdfs=false to enable Hdfs related testing.
-->
<condition property="tests.disableHdfs" value="true">
- <os family="windows"/>
+ <or>
+ <os family="windows"/>
+ <equals arg1="${build.java.runtime}" arg2="9"/>
+ </or>
</condition>
<target name="validate" depends="compile-tools">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e4325331/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 ddbbb64..130118f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java
@@ -18,6 +18,7 @@ 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;
@@ -62,6 +63,8 @@ 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/e4325331/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 37d9cdf..288dfc0 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,6 +52,7 @@ 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"))