svn commit: r1642014 - in /lucene/dev/trunk: lucene/ivy-versions.properties solr/CHANGES.txt solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java solr/licenses/Saxon-HE-9.6.0-2.jar.sha1

[ma...@apache.org]

Author: markrmiller
Date: Thu Nov 27 03:05:17 2014
New Revision: 1642014

URL: http://svn.apache.org/r1642014
Log:
SOLR-6799: Update Saxon-HE to 9.6.0-2.

Added:
    lucene/dev/trunk/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1
Modified:
    lucene/dev/trunk/lucene/ivy-versions.properties
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java

Modified: lucene/dev/trunk/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/ivy-versions.properties?rev=1642014&r1=1642013&r2=1642014&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/ivy-versions.properties (original)
+++ lucene/dev/trunk/lucene/ivy-versions.properties Thu Nov 27 03:05:17 2014
@@ -79,7 +79,7 @@ com.sun.jersey.version = 1.9
 /mecab/mecab-ipadic = 2.7.0-20070801
 /mecab/mecab-naist-jdic = 0.6.3b-20111013
 /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.jmatio/jmatio = 1.0
 /net.sourceforge.nekohtml/nekohtml = 1.9.17

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1642014&r1=1642013&r2=1642014&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Nov 27 03:05:17 2014
@@ -443,6 +443,8 @@ Other Changes
 
 * 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 ==================
 
 Bug Fixes

Modified: lucene/dev/trunk/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java?rev=1642014&r1=1642013&r2=1642014&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java (original)
+++ lucene/dev/trunk/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java Thu Nov 27 03:05:17 2014
@@ -43,8 +43,6 @@ public class SolrCellMorphlineTest exten
   @BeforeClass
   public static void beforeClass2() {
     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

Added: lucene/dev/trunk/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1?rev=1642014&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1 Thu Nov 27 03:05:17 2014
@@ -0,0 +1 @@
+826a6c32fef050346b37e91b36fde16cf932da12