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

SOLR-10219: stop defaulting to tests.disableHdfs=true under java9

This commit is contained in:
Chris Hostetter 2017-03-01 13:48:52 -07:00
parent 540a237231
commit 4851f399d4
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dev-tools/maven/solr/pom.xml.template
View File

@ -173,15 +173,6 @@
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile>
<id>java9-tests-disableHdfs</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<tests.disableHdfs>true</tests.disableHdfs>
</properties>
</profile>
<profile> <profile>
<id>windows-tests-disableHdfs</id> <id>windows-tests-disableHdfs</id>
<activation> <activation>

9
solr/common-build.xml
View File

@ -151,14 +151,11 @@
</macrodef> </macrodef>
<!-- <!--
We don't want to run HDFS tests on Windows, because they require Cygwin. We don't want to run HDFS tests on Windows by default, 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. 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"/>
<available classname="java.lang.reflect.Module"/>
</or>
</condition> </condition>
<target name="validate" depends="compile-tools"> <target name="validate" depends="compile-tools">