You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/03/01 20:49:05 UTC
lucene-solr:master: SOLR-10219: stop defaulting to
tests.disableHdfs=true under java9
Repository: lucene-solr
Updated Branches:
refs/heads/master 540a23723 -> 4851f399d
SOLR-10219: stop defaulting to tests.disableHdfs=true under java9
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4851f399
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4851f399
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4851f399
Branch: refs/heads/master
Commit: 4851f399d4b25f76eeb494d7c63844bf6b858fd5
Parents: 540a237
Author: Chris Hostetter <ho...@apache.org>
Authored: Wed Mar 1 13:48:52 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Wed Mar 1 13:48:52 2017 -0700
----------------------------------------------------------------------
dev-tools/maven/solr/pom.xml.template | 9 ---------
solr/common-build.xml | 9 +++------
2 files changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4851f399/dev-tools/maven/solr/pom.xml.template
----------------------------------------------------------------------
diff --git a/dev-tools/maven/solr/pom.xml.template b/dev-tools/maven/solr/pom.xml.template
index 956b504..c90d684 100644
--- a/dev-tools/maven/solr/pom.xml.template
+++ b/dev-tools/maven/solr/pom.xml.template
@@ -174,15 +174,6 @@
</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>
<os><family>windows</family></os>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4851f399/solr/common-build.xml
----------------------------------------------------------------------
diff --git a/solr/common-build.xml b/solr/common-build.xml
index 5e8976c..3b459e7 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">