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/08/18 15:41:57 UTC
svn commit: r1618604 - in /lucene/dev/branches/branch_4x: ./ lucene/ solr/
solr/licenses/
Author: uschindler
Date: Mon Aug 18 13:41:56 2014
New Revision: 1618604
URL: http://svn.apache.org/r1618604
Log:
Merged revision(s) 1618603 from lucene/dev/trunk:
SOLR-6388: Update Apache TIKA 1.5's Apache POI dependency to 3.10.1
Added:
lucene/dev/branches/branch_4x/solr/licenses/poi-3.10.1.jar.sha1
- copied unchanged from r1618603, lucene/dev/trunk/solr/licenses/poi-3.10.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-3.10.1.jar.sha1
- copied unchanged from r1618603, lucene/dev/trunk/solr/licenses/poi-ooxml-3.10.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-schemas-3.10.1.jar.sha1
- copied unchanged from r1618603, lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.10.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-scratchpad-3.10.1.jar.sha1
- copied unchanged from r1618603, lucene/dev/trunk/solr/licenses/poi-scratchpad-3.10.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/xmlbeans-2.6.0.jar.sha1
- copied unchanged from r1618603, lucene/dev/trunk/solr/licenses/xmlbeans-2.6.0.jar.sha1
Removed:
lucene/dev/branches/branch_4x/solr/licenses/poi-3.10-beta2.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-3.10-beta2.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-schemas-3.10-beta2.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/poi-scratchpad-3.10-beta2.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/xmlbeans-2.3.0.jar.sha1
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
Modified: lucene/dev/branches/branch_4x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/ivy-versions.properties?rev=1618604&r1=1618603&r2=1618604&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_4x/lucene/ivy-versions.properties Mon Aug 18 13:41:56 2014
@@ -130,7 +130,7 @@ org.apache.pdfbox.version = 1.8.4
/org.apache.pdfbox/jempbox = ${org.apache.pdfbox.version}
/org.apache.pdfbox/pdfbox = ${org.apache.pdfbox.version}
-org.apache.poi.version = 3.10-beta2
+org.apache.poi.version = 3.10.1
/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}
@@ -150,7 +150,7 @@ org.apache.uima.version = 2.3.1
/org.apache.velocity/velocity = 1.7
/org.apache.velocity/velocity-tools = 2.0
-/org.apache.xmlbeans/xmlbeans = 2.3.0
+/org.apache.xmlbeans/xmlbeans = 2.6.0
/org.apache.zookeeper/zookeeper = 3.4.6
/org.aspectj/aspectjrt = 1.6.11
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1618604&r1=1618603&r2=1618604&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Aug 18 13:41:56 2014
@@ -24,7 +24,7 @@ Consult the LUCENE_CHANGES.txt file for
Versions of Major Components
---------------------
-Apache Tika 1.5
+Apache Tika 1.5 (with upgraded Apache POI 3.10.1)
Carrot2 3.9.0
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1