svn commit: r1642015 - in /lucene/dev/branches/branch_5x: ./ lucene/ solr/ solr/contrib/ solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/ solr/licenses/

[ma...@apache.org]

Author: markrmiller
Date: Thu Nov 27 03:06:19 2014
New Revision: 1642015

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

Added:
    lucene/dev/branches/branch_5x/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1
      - copied unchanged from r1642014, lucene/dev/trunk/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1
Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/ivy-versions.properties   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/contrib/   (props changed)
    lucene/dev/branches/branch_5x/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
    lucene/dev/branches/branch_5x/solr/licenses/   (props changed)

Modified: lucene/dev/branches/branch_5x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/ivy-versions.properties?rev=1642015&r1=1642014&r2=1642015&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_5x/lucene/ivy-versions.properties Thu Nov 27 03:06:19 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/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1642015&r1=1642014&r2=1642015&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Thu Nov 27 03:06:19 2014
@@ -405,6 +405,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/branches/branch_5x/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java?rev=1642015&r1=1642014&r2=1642015&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java Thu Nov 27 03:06:19 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