SOLR-6799: Update Saxon-HE to 9.6.0-2.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1642014 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2014-11-27 03:05:17 +00:00
parent 3a7dee2f16
commit f8cd5c6688
4 changed files with 4 additions and 3 deletions

View File

@ -79,7 +79,7 @@ com.sun.jersey.version = 1.9
/mecab/mecab-ipadic = 2.7.0-20070801 /mecab/mecab-ipadic = 2.7.0-20070801
/mecab/mecab-naist-jdic = 0.6.3b-20111013 /mecab/mecab-naist-jdic = 0.6.3b-20111013
/net.arnx/jsonic = 1.2.7 /net.arnx/jsonic = 1.2.7
/net.sf.saxon/Saxon-HE = 9.5.1-4 /net.sf.saxon/Saxon-HE = 9.6.0-2
/net.sourceforge.argparse4j/argparse4j = 0.4.3 /net.sourceforge.argparse4j/argparse4j = 0.4.3
/net.sourceforge.jmatio/jmatio = 1.0 /net.sourceforge.jmatio/jmatio = 1.0
/net.sourceforge.nekohtml/nekohtml = 1.9.17 /net.sourceforge.nekohtml/nekohtml = 1.9.17

View File

@ -443,6 +443,8 @@ Other Changes
* SOLR-4792: Stop shipping a .war. (Robert Muir, Ramkumar Aiyengar, Mark Miller) * SOLR-4792: Stop shipping a .war. (Robert Muir, Ramkumar Aiyengar, Mark Miller)
* SOLR-6799: Update Saxon-HE to 9.6.0-2. (Mark Miller)
================== 4.10.3 ================== ================== 4.10.3 ==================
Bug Fixes Bug Fixes

View File

@ -43,8 +43,6 @@ public class SolrCellMorphlineTest extends AbstractSolrMorphlineTestBase {
@BeforeClass @BeforeClass
public static void beforeClass2() { public static void beforeClass2() {
assumeFalse("FIXME: Morphlines currently has issues with Windows paths", Constants.WINDOWS); assumeFalse("FIXME: Morphlines currently has issues with Windows 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"));
} }
@Before @Before

View File

@ -0,0 +1 @@
826a6c32fef050346b37e91b36fde16cf932da12