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/18 09:50:36 UTC
svn commit: r1625908 - in /lucene/dev/branches/lucene_solr_4_9: ./ lucene/
solr/ solr/licenses/
Author: uschindler
Date: Thu Sep 18 07:50:36 2014
New Revision: 1625908
URL: http://svn.apache.org/r1625908
Log:
Merged revision(s) 1618604, 1618960 from lucene/dev/branches/branch_4x:
Merged revision(s) 1618603 from lucene/dev/trunk:
SOLR-6388: Update Apache TIKA 1.5's Apache POI dependency to 3.10.1
........
Merged revision(s) 1618959 from lucene/dev/trunk:
SOLR-6388: Add changes entry
Added:
lucene/dev/branches/lucene_solr_4_9/solr/licenses/poi-3.10.1.jar.sha1
- copied unchanged from r1618604, lucene/dev/branches/branch_4x/solr/licenses/poi-3.10.1.jar.sha1
lucene/dev/branches/lucene_solr_4_9/solr/licenses/poi-ooxml-3.10.1.jar.sha1
- copied unchanged from r1618604, lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-3.10.1.jar.sha1
lucene/dev/branches/lucene_solr_4_9/solr/licenses/poi-ooxml-schemas-3.10.1.jar.sha1
- copied unchanged from r1618604, lucene/dev/branches/branch_4x/solr/licenses/poi-ooxml-schemas-3.10.1.jar.sha1
lucene/dev/branches/lucene_solr_4_9/solr/licenses/poi-scratchpad-3.10.1.jar.sha1
- copied unchanged from r1618604, lucene/dev/branches/branch_4x/solr/licenses/poi-scratchpad-3.10.1.jar.sha1
lucene/dev/branches/lucene_solr_4_9/solr/licenses/xmlbeans-2.6.0.jar.sha1
- copied unchanged from r1618604, lucene/dev/branches/branch_4x/solr/licenses/xmlbeans-2.6.0.jar.sha1
Removed:
lucene/dev/branches/lucene_solr_4_9/solr/licenses/poi-3.10-beta2.jar.sha1
lucene/dev/branches/lucene_solr_4_9/solr/licenses/poi-ooxml-3.10-beta2.jar.sha1
lucene/dev/branches/lucene_solr_4_9/solr/licenses/poi-ooxml-schemas-3.10-beta2.jar.sha1
lucene/dev/branches/lucene_solr_4_9/solr/licenses/poi-scratchpad-3.10-beta2.jar.sha1
lucene/dev/branches/lucene_solr_4_9/solr/licenses/xmlbeans-2.3.0.jar.sha1
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/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=1625908&r1=1625907&r2=1625908&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 Thu Sep 18 07:50:36 2014
@@ -127,7 +127,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}
@@ -147,7 +147,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/lucene_solr_4_9/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt?rev=1625908&r1=1625907&r2=1625908&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt Thu Sep 18 07:50:36 2014
@@ -20,11 +20,19 @@ See the tutorial at http://lucene.apache
$Id$
-* SOLR-5868: HttpClient should be configured to use ALLOW_ALL_HOSTNAME hostname
- verifier to simplify SSL setup. (Steve Davids via Mark Miller)
-
================== 4.9.1 ==================
+Versions of Major Components
+---------------------
+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
+Apache ZooKeeper 3.4.6
+
+Detailed Change List
+----------------------
+
Other Changes
---------------------
@@ -34,6 +42,9 @@ Other Changes
http://www.unidata.ucar.edu/software/thredds/current/netcdf-java/
(Uwe Schindler)
+* SOLR-6388: Force upgrade of Apache POI dependency in Solr Cell to version
+ 3.10.1 to fix CVE-2014-3529 and CVE-2014-3574. (Uwe Schindler)
+
================== 4.9.0 ==================
Versions of Major Components
@@ -206,6 +217,10 @@ Other Changes
* SOLR-6128: Removed deprecated analysis factories and fieldTypes from the example
schema.xml (hossman)
+* SOLR-5868: HttpClient should be configured to use ALLOW_ALL_HOSTNAME hostname
+ verifier to simplify SSL setup. (Steve Davids via Mark Miller)
+
+
Optimizations
----------------------