You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/04/03 15:29:45 UTC

svn commit: r1308890 - in /lucene/dev/branches/branch_3x: dev-tools/eclipse/dot.classpath solr/contrib/extraction/CHANGES.txt solr/contrib/extraction/ivy.xml

Author: rmuir
Date: Tue Apr  3 13:29:44 2012
New Revision: 1308890

URL: http://svn.apache.org/viewvc?rev=1308890&view=rev
Log:
SOLR-3295: binaries contained 1.6 classes

Modified:
    lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
    lucene/dev/branches/branch_3x/solr/contrib/extraction/CHANGES.txt
    lucene/dev/branches/branch_3x/solr/contrib/extraction/ivy.xml

Modified: lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath?rev=1308890&r1=1308889&r2=1308890&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath Tue Apr  3 13:29:44 2012
@@ -135,7 +135,6 @@
 	<classpathentry kind="lib" path="solr/contrib/extraction/lib/fontbox-1.6.0.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/extraction/lib/jempbox-1.6.0.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar"/>
-	<classpathentry kind="lib" path="solr/contrib/extraction/lib/netcdf-4.2-min.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/extraction/lib/pdfbox-1.6.0.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-3.8-beta4.jar"/>
 	<classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-ooxml-3.8-beta4.jar"/>

Modified: lucene/dev/branches/branch_3x/solr/contrib/extraction/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/extraction/CHANGES.txt?rev=1308890&r1=1308889&r2=1308890&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/extraction/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/extraction/CHANGES.txt Tue Apr  3 13:29:44 2012
@@ -32,6 +32,10 @@ $Id$
 
 * SOLR-2901: Upgrade Solr to Tika 1.0 (janhoy)
 
+* SOLR-3295: netcdf jar is excluded from the binary release (and disabled in ivy.xml)
+  because it requires java 6. If you want to parse this content and are willing to
+  use java 6, just add the jar. (rmuir)
+
 ================== Release 3.5.0 ==================
 
 * SOLR-2372: Upgrade Solr to Tika 0.10 (janhoy)

Modified: lucene/dev/branches/branch_3x/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/extraction/ivy.xml?rev=1308890&r1=1308889&r2=1308890&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/extraction/ivy.xml Tue Apr  3 13:29:44 2012
@@ -32,7 +32,9 @@
       <dependency org="jdom" name="jdom" rev="1.0" transitive="false"/>
       <dependency org="org.apache.pdfbox" name="jempbox" rev="1.6.0" transitive="false"/>
       <dependency org="com.drewnoakes" name="metadata-extractor" rev="2.4.0-beta-1" transitive="false"/>
-      <dependency org="edu.ucar" name="netcdf" rev="4.2-min" transitive="false"/>
+      <!-- disabled: this is a java6 jar: if you would like to index this,
+           then enable it. see http://issues.apache.org/jira/browse/SOLR-3295
+      <dependency org="edu.ucar" name="netcdf" rev="4.2-min" transitive="false"/> -->
       <dependency org="org.apache.pdfbox" name="pdfbox" rev="1.6.0" transitive="false"/>
       <dependency org="org.apache.poi" name="poi" rev="3.8-beta4" transitive="false"/>
       <dependency org="org.apache.poi" name="poi-ooxml" rev="3.8-beta4" transitive="false"/>