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 2015/01/19 11:46:09 UTC
svn commit: r1652960 - in /lucene/dev/branches/lucene_solr_5_0: ./ solr/
solr/contrib/ solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/
solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/
Author: uschindler
Date: Mon Jan 19 10:46:09 2015
New Revision: 1652960
URL: http://svn.apache.org/r1652960
Log:
Merged revision(s) 1652956 from lucene/dev/trunk:
SOLR-6799: Update Saxon-HE to 9.6.0-2 (part 2)
Modified:
lucene/dev/branches/lucene_solr_5_0/ (props changed)
lucene/dev/branches/lucene_solr_5_0/solr/ (props changed)
lucene/dev/branches/lucene_solr_5_0/solr/contrib/ (props changed)
lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java
lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java
lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java
lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java
lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java
Modified: lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java?rev=1652960&r1=1652959&r2=1652960&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java Mon Jan 19 10:46:09 2015
@@ -118,8 +118,6 @@ public class MorphlineBasicMiniMRTest ex
Boolean.parseBoolean(System.getProperty("tests.disableHdfs", "false")));
assumeFalse("FIXME: This test does not work with Windows because of native library requirements", Constants.WINDOWS);
- assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
- assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
AbstractZkTestCase.SOLRHOME = solrHomeDirectory;
FileUtils.copyDirectory(MINIMR_CONF_DIR, solrHomeDirectory);
Modified: lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java?rev=1652960&r1=1652959&r2=1652960&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java Mon Jan 19 10:46:09 2015
@@ -141,8 +141,6 @@ public class MorphlineGoLiveMiniMRTest e
Boolean.parseBoolean(System.getProperty("tests.disableHdfs", "false")));
assumeFalse("FIXME: This test does not work with Windows because of native library requirements", Constants.WINDOWS);
- assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
- assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
AbstractZkTestCase.SOLRHOME = solrHomeDirectory;
FileUtils.copyDirectory(MINIMR_INSTANCE_DIR, AbstractZkTestCase.SOLRHOME);
Modified: lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java?rev=1652960&r1=1652959&r2=1652960&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java Mon Jan 19 10:46:09 2015
@@ -35,8 +35,6 @@ public class MorphlineMapperTest extends
@BeforeClass
public static void beforeClass() {
assumeFalse("Does not work on Windows, because it uses UNIX shell commands or POSIX paths", Constants.WINDOWS);
- assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
- assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
}
@Test
Modified: lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java?rev=1652960&r1=1652959&r2=1652960&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java Mon Jan 19 10:46:09 2015
@@ -48,8 +48,6 @@ public class MorphlineReducerTest extend
@BeforeClass
public static void beforeClass2() {
assumeFalse("Does not work on Windows, because it uses UNIX shell commands or POSIX paths", Constants.WINDOWS);
- assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
- assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
System.setProperty("verifyPartitionAssignment", "false");
}
Modified: lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java?rev=1652960&r1=1652959&r2=1652960&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java Mon Jan 19 10:46:09 2015
@@ -29,12 +29,6 @@ import org.kitesdk.morphline.base.Notifi
public class SolrMorphlineTest extends AbstractSolrMorphlineTestBase {
- @BeforeClass
- public static void beforeClass2() {
- assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
- assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
- }
-
@Test
public void testLoadSolrBasic() throws Exception {
//System.setProperty("ENV_SOLR_HOME", testSolrHome + "/collection1");
Modified: lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java?rev=1652960&r1=1652959&r2=1652960&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java Mon Jan 19 10:46:09 2015
@@ -50,12 +50,6 @@ import com.carrotsearch.randomizedtestin
@Slow
public class SolrMorphlineZkAliasTest extends AbstractSolrMorphlineZkTestBase {
- @BeforeClass
- public static void beforeClass2() {
- assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
- assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
- }
-
@Override
public void doTest() throws Exception {
Modified: lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java?rev=1652960&r1=1652959&r2=1652960&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java Mon Jan 19 10:46:09 2015
@@ -56,12 +56,6 @@ import com.google.common.io.Files;
@Slow
public class SolrMorphlineZkAvroTest extends AbstractSolrMorphlineZkTestBase {
- @BeforeClass
- public static void beforeClass2() {
- assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
- assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
- }
-
@Override
public void doTest() throws Exception {
Joiner joiner = Joiner.on(File.separator);
Modified: lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java?rev=1652960&r1=1652959&r2=1652960&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java Mon Jan 19 10:46:09 2015
@@ -44,12 +44,6 @@ import com.carrotsearch.randomizedtestin
@Slow
public class SolrMorphlineZkTest extends AbstractSolrMorphlineZkTestBase {
- @BeforeClass
- public static void beforeClass2() {
- assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
- assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
- }
-
@Override
public void doTest() throws Exception {