You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/09/17 15:10:47 UTC
svn commit: r1625573 - in /lucene/dev/branches/lucene_solr_4_9: ./ lucene/
solr/ solr/contrib/ solr/contrib/extraction/ solr/licenses/
Author: uschindler
Date: Wed Sep 17 13:10:46 2014
New Revision: 1625573
URL: http://svn.apache.org/r1625573
Log:
Merged revision(s) 1624071 from lucene/dev/branches/lucene_solr_4_10:
SOLR-6503: Removed support for parsing netcdf files in Solr Cell because of license issues
Removed:
lucene/dev/branches/lucene_solr_4_9/solr/licenses/netcdf-4.2-min.jar.sha1
lucene/dev/branches/lucene_solr_4_9/solr/licenses/netcdf-LICENSE-MIT.txt
lucene/dev/branches/lucene_solr_4_9/solr/licenses/netcdf-NOTICE.txt
Modified:
lucene/dev/branches/lucene_solr_4_9/ (props changed)
lucene/dev/branches/lucene_solr_4_9/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_9/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/lucene_solr_4_9/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_9/solr/contrib/ (props changed)
lucene/dev/branches/lucene_solr_4_9/solr/contrib/extraction/ivy.xml
lucene/dev/branches/lucene_solr_4_9/solr/licenses/ (props changed)
Modified: lucene/dev/branches/lucene_solr_4_9/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_9/lucene/ivy-versions.properties?rev=1625573&r1=1625572&r2=1625573&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_9/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/lucene_solr_4_9/lucene/ivy-versions.properties Wed Sep 17 13:10:46 2014
@@ -61,7 +61,6 @@ com.sun.jersey.version = 1.9
/commons-logging/commons-logging = 1.1.3
/de.l3s.boilerpipe/boilerpipe = 1.1.0
/dom4j/dom4j = 1.6.1
-/edu.ucar/netcdf = 4.2-min
/hsqldb/hsqldb = 1.8.0.10
/io.netty/netty = 3.7.0.Final
/jakarta-regexp/jakarta-regexp = 1.4
Modified: lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt?rev=1625573&r1=1625572&r2=1625573&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt Wed Sep 17 13:10:46 2014
@@ -25,6 +25,15 @@ $Id$
================== 4.9.1 ==================
+Other Changes
+---------------------
+
+* SOLR-6503: Removed support for parsing netcdf files in Solr Cell because
+ of license issues. If you need support for this format, download the parser
+ JAR yourself (version 4.2) and add it to contrib/extraction/lib folder:
+ http://www.unidata.ucar.edu/software/thredds/current/netcdf-java/
+ (Uwe Schindler)
+
================== 4.9.0 ==================
Versions of Major Components
Modified: lucene/dev/branches/lucene_solr_4_9/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_9/solr/contrib/extraction/ivy.xml?rev=1625573&r1=1625572&r2=1625573&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_9/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/branches/lucene_solr_4_9/solr/contrib/extraction/ivy.xml Wed Sep 17 13:10:46 2014
@@ -29,10 +29,10 @@
<dependency org="org.apache.tika" name="tika-xmp" rev="${/org.apache.tika/tika-xmp}" conf="compile->*"/>
<!-- Tika dependencies - see http://tika.apache.org/1.3/gettingstarted.html#Using_Tika_as_a_Maven_dependency -->
<!-- When upgrading Tika, upgrade dependencies versions and add any new ones
- (except slf4j-api, commons-codec, commons-logging, geronimo-stax-api_1.0_spec) -->
+ (except slf4j-api, commons-codec, commons-logging, commons-httpclient, geronimo-stax-api_1.0_spec, jcip-annotations, xml-apis, asm)
+ WARNING: Don't add netcdf / unidataCommon (partially LGPL code) -->
<dependency org="org.gagravarr" name="vorbis-java-tika" rev="${/org.gagravarr/vorbis-java-tika}" conf="compile->*"/>
<dependency org="org.gagravarr" name="vorbis-java-core" rev="${/org.gagravarr/vorbis-java-core}" conf="compile->*"/>
- <dependency org="edu.ucar" name="netcdf" rev="${/edu.ucar/netcdf}" conf="compile->*"/>
<dependency org="org.apache.james" name="apache-mime4j-core" rev="${/org.apache.james/apache-mime4j-core}" conf="compile->*"/>
<dependency org="org.apache.james" name="apache-mime4j-dom" rev="${/org.apache.james/apache-mime4j-dom}" conf="compile->*"/>
<dependency org="org.apache.commons" name="commons-compress" rev="${/org.apache.commons/commons-compress}" conf="compile->*"/>