From cb558014e5d90810817f0e7c6d0c27195333d5bd Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Mon, 19 Jan 2015 10:34:56 +0000 Subject: [PATCH] SOLR-6799: Update Saxon-HE to 9.6.0-2 (part 2) git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1652956 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java | 2 -- .../org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java | 2 -- .../test/org/apache/solr/hadoop/MorphlineMapperTest.java | 2 -- .../test/org/apache/solr/hadoop/MorphlineReducerTest.java | 2 -- .../org/apache/solr/morphlines/solr/SolrMorphlineTest.java | 6 ------ .../solr/morphlines/solr/SolrMorphlineZkAliasTest.java | 6 ------ .../solr/morphlines/solr/SolrMorphlineZkAvroTest.java | 6 ------ .../apache/solr/morphlines/solr/SolrMorphlineZkTest.java | 6 ------ 8 files changed, 32 deletions(-) diff --git a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java index 0c8b3a0d374..3fca912cbc9 100644 --- a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java +++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java @@ -118,8 +118,6 @@ public class MorphlineBasicMiniMRTest extends SolrTestCaseJ4 { 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); diff --git a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java index c43586c5bb6..002f7e39f47 100644 --- a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java +++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java @@ -141,8 +141,6 @@ public class MorphlineGoLiveMiniMRTest extends AbstractFullDistribZkTestBase { 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); diff --git a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java index 2e7f7e44bc5..3aa08a5d6bb 100644 --- a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java +++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineMapperTest.java @@ -35,8 +35,6 @@ public class MorphlineMapperTest extends MRUnitBase { @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 diff --git a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java index 663ff2a7818..89a5110e6ae 100644 --- a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java +++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineReducerTest.java @@ -48,8 +48,6 @@ public class MorphlineReducerTest extends MRUnitBase { @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"); } diff --git a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java index d68ad480baa..1731b4dc62c 100644 --- a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java +++ b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java @@ -29,12 +29,6 @@ import org.kitesdk.morphline.base.Notifications; 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"); diff --git a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java index be5626ccdaa..43a813af914 100644 --- a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java +++ b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java @@ -50,12 +50,6 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies.Conseque @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 { diff --git a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java index 816e827a1d5..e9b9d105cf8 100644 --- a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java +++ b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java @@ -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); diff --git a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java index 69865a6bec6..b75314c4465 100644 --- a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java +++ b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java @@ -44,12 +44,6 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies.Conseque @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 {