lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1652745 - in /lucene/dev/branches/branch_5x: ./ lucene/ solr/ solr/contrib/ solr/contrib/extraction/ solr/licenses/
Date Sun, 18 Jan 2015 11:55:30 GMT
Author: uschindler
Date: Sun Jan 18 11:55:29 2015
New Revision: 1652745

URL: http://svn.apache.org/r1652745
Log:
SOLR-6991: Update to Apache TIKA 1.7

Added:
    lucene/dev/branches/branch_5x/solr/licenses/fontbox-1.8.8.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/fontbox-1.8.8.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/jcl-over-slf4j-1.7.7.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/jcl-over-slf4j-1.7.7.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/jempbox-1.8.8.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/jempbox-1.8.8.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/jul-to-slf4j-1.7.7.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/jul-to-slf4j-1.7.7.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/pdfbox-1.8.8.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/pdfbox-1.8.8.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/poi-3.11.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/poi-3.11.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/poi-ooxml-3.11.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/poi-ooxml-3.11.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/poi-ooxml-schemas-3.11.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.11.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/poi-scratchpad-3.11.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/poi-scratchpad-3.11.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/slf4j-api-1.7.7.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/slf4j-api-1.7.7.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/slf4j-log4j12-1.7.7.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/slf4j-log4j12-1.7.7.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/tika-core-1.7.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/tika-core-1.7.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/tika-java7-1.7.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/tika-java7-1.7.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/tika-parsers-1.7.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/tika-parsers-1.7.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/tika-xmp-1.7.jar.sha1
      - copied unchanged from r1652742, lucene/dev/trunk/solr/licenses/tika-xmp-1.7.jar.sha1
Removed:
    lucene/dev/branches/branch_5x/solr/licenses/fontbox-1.8.6.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/jcl-over-slf4j-1.7.6.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/jempbox-1.8.6.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/jul-to-slf4j-1.7.6.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/pdfbox-1.8.6.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/poi-3.11-beta2.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/poi-ooxml-3.11-beta2.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/poi-ooxml-schemas-3.11-beta2.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/poi-scratchpad-3.11-beta2.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/slf4j-api-1.7.6.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/slf4j-log4j12-1.7.6.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/tika-core-1.6.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/tika-parsers-1.6.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/tika-xmp-1.6.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/extraction/ivy.xml
    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=1652745&r1=1652744&r2=1652745&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_5x/lucene/ivy-versions.properties Sun Jan 18 11:55:29 2015
@@ -128,19 +128,20 @@ org.apache.james.apache.mime4j.version =
 /org.apache.mahout/mahout-math = 0.6
 /org.apache.mrunit/mrunit = 1.0.0
 
-org.apache.pdfbox.version = 1.8.6
+org.apache.pdfbox.version = 1.8.8
 /org.apache.pdfbox/fontbox = ${org.apache.pdfbox.version}
 /org.apache.pdfbox/jempbox = ${org.apache.pdfbox.version}
 /org.apache.pdfbox/pdfbox = ${org.apache.pdfbox.version}
 
-org.apache.poi.version = 3.11-beta2
+org.apache.poi.version = 3.11
 /org.apache.poi/poi = ${org.apache.poi.version}
 /org.apache.poi/poi-ooxml = ${org.apache.poi.version}
 /org.apache.poi/poi-ooxml-schemas = ${org.apache.poi.version}
 /org.apache.poi/poi-scratchpad = ${org.apache.poi.version}
 
-org.apache.tika.version = 1.6
+org.apache.tika.version = 1.7
 /org.apache.tika/tika-core = ${org.apache.tika.version}
+/org.apache.tika/tika-java7 = ${org.apache.tika.version}
 /org.apache.tika/tika-parsers = ${org.apache.tika.version}
 /org.apache.tika/tika-xmp = ${org.apache.tika.version}
 
@@ -228,7 +229,7 @@ org.restlet.jee.version = 2.1.1
 
 /org.simpleframework/simple-xml = 2.7
 
-org.slf4j.version = 1.7.6
+org.slf4j.version = 1.7.7
 /org.slf4j/jcl-over-slf4j = ${org.slf4j.version}
 /org.slf4j/jul-to-slf4j = ${org.slf4j.version}
 /org.slf4j/slf4j-api = ${org.slf4j.version}

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1652745&r1=1652744&r2=1652745&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Sun Jan 18 11:55:29 2015
@@ -19,6 +19,17 @@ See the Quick Start guide at http://luce
 
 ==================  5.1.0 ==================
 
+Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
+
+Versions of Major Components
+---------------------
+Apache Tika 1.7
+Carrot2 3.9.0
+Velocity 1.7 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.4.6
+Jetty 9.2.6.v20141205
+
 Detailed Change List
 ----------------------
 
@@ -28,6 +39,7 @@ New Features
 * SOLR-6909: Extract atomic update handling logic into AtomicUpdateDocumentMerger class
   and enable subclassing. (Steve Davids, yonik)
 
+* SOLR-6991: Update Apache TIKA to version 1.7. (Uwe Schindler)
 
 ==================  5.0.0 ==================
 

Modified: lucene/dev/branches/branch_5x/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/extraction/ivy.xml?rev=1652745&r1=1652744&r2=1652745&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/extraction/ivy.xml Sun Jan 18 11:55:29 2015
@@ -27,6 +27,7 @@
     <dependency org="org.apache.tika" name="tika-core" rev="${/org.apache.tika/tika-core}"
conf="compile"/>
     <dependency org="org.apache.tika" name="tika-parsers" rev="${/org.apache.tika/tika-parsers}"
conf="compile"/>
     <dependency org="org.apache.tika" name="tika-xmp" rev="${/org.apache.tika/tika-xmp}"
conf="compile"/>
+    <dependency org="org.apache.tika" name="tika-java7" rev="${/org.apache.tika/tika-java7}"
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, commons-httpclient, geronimo-stax-api_1.0_spec,
jcip-annotations, xml-apis, asm)



Mime
View raw message