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/07 22:50:14 UTC
svn commit: r1623225 - in /lucene/dev/trunk: lucene/ lucene/licenses/ solr/
solr/contrib/extraction/
solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/
solr/licenses/
Author: uschindler
Date: Sun Sep 7 20:50:13 2014
New Revision: 1623225
URL: http://svn.apache.org/r1623225
Log:
SOLR-6488: Upgrade Solr Cell to TIKA 1.6
Added:
lucene/dev/trunk/lucene/licenses/commons-compress-1.8.1.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/aspectjrt-1.8.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/commons-compress-1.8.1.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/fontbox-1.8.6.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/isoparser-1.0.2.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/java-libpst-0.8.1.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/java-libpst-LICENSE-ASL.txt (with props)
lucene/dev/trunk/solr/licenses/java-libpst-NOTICE.txt (with props)
lucene/dev/trunk/solr/licenses/jempbox-1.8.6.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jmatio-1.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/jmatio-LICENSE-BSD.txt (with props)
lucene/dev/trunk/solr/licenses/jmatio-NOTICE.txt (with props)
lucene/dev/trunk/solr/licenses/pdfbox-1.8.6.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/poi-3.11-beta2.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/poi-ooxml-3.11-beta2.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.11-beta2.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/poi-scratchpad-3.11-beta2.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/rome-1.0.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/tika-core-1.6.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/tika-parsers-1.6.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/tika-xmp-1.6.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/vorbis-java-core-0.6.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/vorbis-java-tika-0.6.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/xz-1.5.jar.sha1 (with props)
Removed:
lucene/dev/trunk/lucene/licenses/commons-compress-1.7.jar.sha1
lucene/dev/trunk/solr/licenses/aspectjrt-1.6.11.jar.sha1
lucene/dev/trunk/solr/licenses/commons-compress-1.7.jar.sha1
lucene/dev/trunk/solr/licenses/fontbox-1.8.4.jar.sha1
lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-1.jar.sha1
lucene/dev/trunk/solr/licenses/jempbox-1.8.4.jar.sha1
lucene/dev/trunk/solr/licenses/netcdf-4.2-min.jar.sha1
lucene/dev/trunk/solr/licenses/netcdf-LICENSE-MIT.txt
lucene/dev/trunk/solr/licenses/netcdf-NOTICE.txt
lucene/dev/trunk/solr/licenses/pdfbox-1.8.4.jar.sha1
lucene/dev/trunk/solr/licenses/poi-3.10.1.jar.sha1
lucene/dev/trunk/solr/licenses/poi-ooxml-3.10.1.jar.sha1
lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.10.1.jar.sha1
lucene/dev/trunk/solr/licenses/poi-scratchpad-3.10.1.jar.sha1
lucene/dev/trunk/solr/licenses/rome-0.9.jar.sha1
lucene/dev/trunk/solr/licenses/tika-core-1.5.jar.sha1
lucene/dev/trunk/solr/licenses/tika-parsers-1.5.jar.sha1
lucene/dev/trunk/solr/licenses/tika-xmp-1.5.jar.sha1
lucene/dev/trunk/solr/licenses/vorbis-java-core-0.1.jar.sha1
lucene/dev/trunk/solr/licenses/vorbis-java-tika-0.1.jar.sha1
lucene/dev/trunk/solr/licenses/xz-1.4.jar.sha1
Modified:
lucene/dev/trunk/lucene/ivy-versions.properties
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/NOTICE.txt
lucene/dev/trunk/solr/contrib/extraction/ivy.xml
lucene/dev/trunk/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
Modified: lucene/dev/trunk/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/ivy-versions.properties?rev=1623225&r1=1623224&r2=1623225&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/ivy-versions.properties (original)
+++ lucene/dev/trunk/lucene/ivy-versions.properties Sun Sep 7 20:50:13 2014
@@ -34,8 +34,9 @@ com.google.inject.guice.version = 3.0
/com.google.protobuf/protobuf-java = 2.5.0
/com.googlecode.concurrentlinkedhashmap/concurrentlinkedhashmap-lru = 1.2
/com.googlecode.juniversalchardet/juniversalchardet = 1.0.3
-/com.googlecode.mp4parser/isoparser = 1.0-RC-1
+/com.googlecode.mp4parser/isoparser = 1.0.2
/com.ibm.icu/icu4j = 53.1
+/com.pff/java-libpst = 0.8.1
/com.spatial4j/spatial4j = 0.4.1
com.sun.jersey.version = 1.9
@@ -64,7 +65,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
@@ -81,11 +81,12 @@ com.sun.jersey.version = 1.9
/net.arnx/jsonic = 1.2.7
/net.sf.saxon/Saxon-HE = 9.5.1-4
/net.sourceforge.argparse4j/argparse4j = 0.4.3
+/net.sourceforge.jmatio/jmatio = 1.0
/net.sourceforge.nekohtml/nekohtml = 1.9.17
/org.antlr/antlr-runtime = 3.5
/org.apache.ant/ant = 1.8.2
/org.apache.avro/avro = 1.7.5
-/org.apache.commons/commons-compress = 1.7
+/org.apache.commons/commons-compress = 1.8.1
/org.apache.derby/derby = 10.9.1.0
org.apache.hadoop.version = 2.2.0
@@ -125,18 +126,18 @@ 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.4
+org.apache.pdfbox.version = 1.8.6
/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.10.1
+org.apache.poi.version = 3.11-beta2
/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.5
+org.apache.tika.version = 1.6
/org.apache.tika/tika-core = ${org.apache.tika.version}
/org.apache.tika/tika-parsers = ${org.apache.tika.version}
/org.apache.tika/tika-xmp = ${org.apache.tika.version}
@@ -152,7 +153,7 @@ org.apache.uima.version = 2.3.1
/org.apache.velocity/velocity-tools = 2.0
/org.apache.xmlbeans/xmlbeans = 2.6.0
/org.apache.zookeeper/zookeeper = 3.4.6
-/org.aspectj/aspectjrt = 1.6.11
+/org.aspectj/aspectjrt = 1.8.0
org.bouncycastle.version = 1.45
/org.bouncycastle/bcmail-jdk15 = ${org.bouncycastle.version}
@@ -191,7 +192,7 @@ org.eclipse.jetty.version = 8.1.10.v2013
/org.eclipse.jetty/jetty-webapp = ${org.eclipse.jetty.version}
/org.eclipse.jetty/jetty-xml = ${org.eclipse.jetty.version}
-org.gagravarr.vorbis.java.version = 0.1
+org.gagravarr.vorbis.java.version = 0.6
/org.gagravarr/vorbis-java-core = ${org.gagravarr.vorbis.java.version}
/org.gagravarr/vorbis-java-tika = ${org.gagravarr.vorbis.java.version}
@@ -230,7 +231,7 @@ org.slf4j.version = 1.7.6
/org.slf4j/slf4j-api = ${org.slf4j.version}
/org.slf4j/slf4j-log4j12 = ${org.slf4j.version}
-/org.tukaani/xz = 1.4
+/org.tukaani/xz = 1.5
/org.xerial.snappy/snappy-java = 1.0.5
-/rome/rome = 0.9
+/rome/rome = 1.0
/xerces/xercesImpl = 2.9.1
Added: lucene/dev/trunk/lucene/licenses/commons-compress-1.8.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/licenses/commons-compress-1.8.1.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/licenses/commons-compress-1.8.1.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/licenses/commons-compress-1.8.1.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+a698750c16740fd5b3871425f4cb3bbaa87f529d
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1623225&r1=1623224&r2=1623225&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sun Sep 7 20:50:13 2014
@@ -23,7 +23,7 @@ Consult the LUCENE_CHANGES.txt file for
Versions of Major Components
---------------------
-Apache Tika 1.5 (with upgraded Apache POI 3.10.1)
+Apache Tika 1.6
Carrot2 3.9.0
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
@@ -111,7 +111,7 @@ Consult the LUCENE_CHANGES.txt file for
Versions of Major Components
---------------------
-Apache Tika 1.5 (with upgraded Apache POI 3.10.1)
+Apache Tika 1.6
Carrot2 3.9.0
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
@@ -202,6 +202,12 @@ Other Changes
* SOLR-5322: core discovery can fail w/NPE and no explanation if a non-readable directory exists
(Said Chavkin, Erick Erickson)
+* SOLR-6488: Update to Apache Tika 1.6. This adds support for parsing Outlook PST and Matlab
+ MAT files. Parsing for NetCDF files was removed because of license issues; if you need support
+ for this format, download the parser JAR yourself and add it to contrib/extraction/lib folder:
+ http://www.unidata.ucar.edu/software/thredds/current/netcdf-java/
+ (Uwe Schindler)
+
================== 4.10.0 =================
Modified: lucene/dev/trunk/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/NOTICE.txt?rev=1623225&r1=1623224&r2=1623225&view=diff
==============================================================================
--- lucene/dev/trunk/solr/NOTICE.txt (original)
+++ lucene/dev/trunk/solr/NOTICE.txt Sun Sep 7 20:50:13 2014
@@ -73,6 +73,9 @@ License: Common Development and Distribu
The HdfsDirectory and BlockDirectory were derived from
the Apache Blur incubating project and are Apache License 2.0.
+ASM (Java bytecode manipulation and analysis framework): http://asm.ow2.org/
+Copyright (c) 2000-2005 INRIA, France Telecom
+
=========================================================================
== Apache Lucene Notice ==
=========================================================================
@@ -336,8 +339,6 @@ Copyright (c) 2003-2005, www.fontbox.org
Copyright (c) 1995-2005 International Business Machines Corporation and others
-Copyright (c) 2000-2005 INRIA, France Telecom
-
Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
Copyright 2004 Sun Microsystems, Inc. (Rome JAR)
@@ -350,6 +351,12 @@ Copyright 2012 Kohei Taketa juniversalch
Lasse Collin and others, XZ for Java (http://tukaani.org/xz/java.html)
+java-libpst is a pure java library for the reading of Outlook PST and OST files.
+https://github.com/rjohnsondev/java-libpst
+
+JMatIO is a JAVA library to read/write/manipulate with Matlab binary MAT-files.
+http://www.sourceforge.net/projects/jmatio
+
=========================================================================
== Language Detection Notices ==
=========================================================================
Modified: lucene/dev/trunk/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/ivy.xml?rev=1623225&r1=1623224&r2=1623225&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/extraction/ivy.xml Sun Sep 7 20:50:13 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->*"/>
@@ -46,7 +46,6 @@
<dependency org="org.apache.poi" name="poi-ooxml" rev="${/org.apache.poi/poi-ooxml}" conf="compile->*"/>
<dependency org="org.apache.poi" name="poi-ooxml-schemas" rev="${/org.apache.poi/poi-ooxml-schemas}" conf="compile->*"/>
<dependency org="org.apache.xmlbeans" name="xmlbeans" rev="${/org.apache.xmlbeans/xmlbeans}" conf="compile->*"/>
- <dependency org="dom4j" name="dom4j" rev="${/dom4j/dom4j}" conf="compile->*"/>
<dependency org="org.ccil.cowan.tagsoup" name="tagsoup" rev="${/org.ccil.cowan.tagsoup/tagsoup}" conf="compile->*"/>
<dependency org="com.googlecode.mp4parser" name="isoparser" rev="${/com.googlecode.mp4parser/isoparser}" conf="compile->*"/>
<dependency org="org.aspectj" name="aspectjrt" rev="${/org.aspectj/aspectjrt}" conf="compile->*"/>
@@ -58,6 +57,8 @@
<dependency org="org.tukaani" name="xz" rev="${/org.tukaani/xz}" conf="compile->*"/>
<dependency org="com.adobe.xmp" name="xmpcore" rev="${/com.adobe.xmp/xmpcore}" conf="compile->*"/>
<dependency org="com.uwyn" name="jhighlight" rev="${/com.uwyn/jhighlight}" conf="compile->*"/>
+ <dependency org="com.pff" name="java-libpst" rev="${/com.pff/java-libpst}" conf="compile->*"/>
+ <dependency org="net.sourceforge.jmatio" name="jmatio" rev="${/net.sourceforge.jmatio/jmatio}" conf="compile->*"/>
<!-- Other ExtractingRequestHandler dependencies -->
<dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" conf="compile->*"/>
Modified: lucene/dev/trunk/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java?rev=1623225&r1=1623224&r2=1623225&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java (original)
+++ lucene/dev/trunk/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java Sun Sep 7 20:50:13 2014
@@ -264,6 +264,7 @@ public class ExtractingRequestHandlerTes
"fmap.language", "extractedLanguage",
"literal.extractionLiteral", "one",
"literal.extractionLiteral", "two",
+ "fmap.X-Parsed-By", "ignored_parser",
"fmap.Last-Modified", "extractedDate"
);
// TODO: original author did not specify why an exception should be thrown... how to fix?
@@ -279,6 +280,7 @@ public class ExtractingRequestHandlerTes
"literal.id", "three",
"fmap.language", "extractedLanguage",
"literal.extractionLiteral", "one",
+ "fmap.X-Parsed-By", "ignored_parser",
"fmap.Last-Modified", "extractedDate"
);
assertU(commit());
@@ -297,6 +299,7 @@ public class ExtractingRequestHandlerTes
"fmap.Author", "extractedAuthor",
"literal.id", "one",
"fmap.language", "extractedLanguage",
+ "fmap.X-Parsed-By", "ignored_parser",
"fmap.content", "extractedContent",
ExtractingParams.STREAM_TYPE, "text/plain"
);
@@ -316,6 +319,7 @@ public class ExtractingRequestHandlerTes
"fmap.Author", "extractedAuthor",
"literal.id", "one",
"fmap.language", "extractedLanguage",
+ "fmap.X-Parsed-By", "ignored_parser",
"fmap.content", "extractedContent",
ExtractingParams.RESOURCE_NAME, "extraction/version_control.txt"
);
Added: lucene/dev/trunk/solr/licenses/aspectjrt-1.8.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/aspectjrt-1.8.0.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/aspectjrt-1.8.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/aspectjrt-1.8.0.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+302d0fe0abba26bbf5f31c3cd5337b3125c744e3
Added: lucene/dev/trunk/solr/licenses/commons-compress-1.8.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/commons-compress-1.8.1.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/commons-compress-1.8.1.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/commons-compress-1.8.1.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+a698750c16740fd5b3871425f4cb3bbaa87f529d
Added: lucene/dev/trunk/solr/licenses/fontbox-1.8.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/fontbox-1.8.6.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/fontbox-1.8.6.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/fontbox-1.8.6.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+024be806ffd12fc8ab4d69e8992377a877de36b8
Added: lucene/dev/trunk/solr/licenses/isoparser-1.0.2.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/isoparser-1.0.2.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/isoparser-1.0.2.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/isoparser-1.0.2.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+6d9a5c5814ec67178dd1d5a25bae874d4697a5b8
Added: lucene/dev/trunk/solr/licenses/java-libpst-0.8.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/java-libpst-0.8.1.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/java-libpst-0.8.1.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/java-libpst-0.8.1.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+ad31986653dac9cb5132ea5b2999c20b4b286255
Added: lucene/dev/trunk/solr/licenses/java-libpst-LICENSE-ASL.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/java-libpst-LICENSE-ASL.txt?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/java-libpst-LICENSE-ASL.txt (added)
+++ lucene/dev/trunk/solr/licenses/java-libpst-LICENSE-ASL.txt Sun Sep 7 20:50:13 2014
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: lucene/dev/trunk/solr/licenses/java-libpst-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/java-libpst-NOTICE.txt?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/java-libpst-NOTICE.txt (added)
+++ lucene/dev/trunk/solr/licenses/java-libpst-NOTICE.txt Sun Sep 7 20:50:13 2014
@@ -0,0 +1,4 @@
+java-libpst is a pure java library for the reading of Outlook PST and OST files.
+https://github.com/rjohnsondev/java-libpst
+
+java-libpst is licensed under both the LGPL and Apache License v2.0
Added: lucene/dev/trunk/solr/licenses/jempbox-1.8.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jempbox-1.8.6.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jempbox-1.8.6.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jempbox-1.8.6.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+6a2727fe097641d0a65338068aa5d9ffbc0178cc
Added: lucene/dev/trunk/solr/licenses/jmatio-1.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jmatio-1.0.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jmatio-1.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jmatio-1.0.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+df72993ea17d34c3bacd983558d2970a866abaf6
Added: lucene/dev/trunk/solr/licenses/jmatio-LICENSE-BSD.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jmatio-LICENSE-BSD.txt?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jmatio-LICENSE-BSD.txt (added)
+++ lucene/dev/trunk/solr/licenses/jmatio-LICENSE-BSD.txt Sun Sep 7 20:50:13 2014
@@ -0,0 +1,28 @@
+Copyright (c) 2006, Wojciech Gradkowski
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of the JMatIO nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Added: lucene/dev/trunk/solr/licenses/jmatio-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jmatio-NOTICE.txt?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jmatio-NOTICE.txt (added)
+++ lucene/dev/trunk/solr/licenses/jmatio-NOTICE.txt Sun Sep 7 20:50:13 2014
@@ -0,0 +1,8 @@
+JMatIO is a JAVA library to read/write/manipulate with Matlab binary
+MAT-files.
+
+If you would like to comment, improve, critisize the project please
+email me: wgradkowski@gmail.com
+
+or visit JMatIO project page at Sourceforge:
+http://www.sourceforge.net/projects/jmatio
Added: lucene/dev/trunk/solr/licenses/pdfbox-1.8.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/pdfbox-1.8.6.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/pdfbox-1.8.6.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/pdfbox-1.8.6.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+b5233e1070e7a5d1b041e549b9f93712485deb50
Added: lucene/dev/trunk/solr/licenses/poi-3.11-beta2.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/poi-3.11-beta2.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/poi-3.11-beta2.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/poi-3.11-beta2.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+5b89faba0fd879a6a7eca16e81a47a2fd008738a
Added: lucene/dev/trunk/solr/licenses/poi-ooxml-3.11-beta2.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/poi-ooxml-3.11-beta2.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/poi-ooxml-3.11-beta2.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/poi-ooxml-3.11-beta2.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+6ea3924178a334b5298aede99bca3feaae8765bf
Added: lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.11-beta2.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.11-beta2.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.11-beta2.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.11-beta2.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+76e88385937608ef805a040b35185220e5d95ea1
Added: lucene/dev/trunk/solr/licenses/poi-scratchpad-3.11-beta2.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/poi-scratchpad-3.11-beta2.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/poi-scratchpad-3.11-beta2.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/poi-scratchpad-3.11-beta2.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+77a69b5418faeeb22ad5645708711ebc59c13254
Added: lucene/dev/trunk/solr/licenses/rome-1.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/rome-1.0.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/rome-1.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/rome-1.0.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+022b33347f315833e9348cec2751af1a5d5656e4
Added: lucene/dev/trunk/solr/licenses/tika-core-1.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/tika-core-1.6.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/tika-core-1.6.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/tika-core-1.6.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+fbccbe81436fc61dbe81d2a8d83c8e50b49d5771
Added: lucene/dev/trunk/solr/licenses/tika-parsers-1.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/tika-parsers-1.6.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/tika-parsers-1.6.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/tika-parsers-1.6.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+13e2a8ca4bb471155663ccb72b92e5f8cc70a02c
Added: lucene/dev/trunk/solr/licenses/tika-xmp-1.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/tika-xmp-1.6.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/tika-xmp-1.6.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/tika-xmp-1.6.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+2668676f66597033d276301cc4fab3bf4b965a2c
Added: lucene/dev/trunk/solr/licenses/vorbis-java-core-0.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/vorbis-java-core-0.6.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/vorbis-java-core-0.6.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/vorbis-java-core-0.6.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+71deedbdfe6a1b0dcadd6c5ae335e3e9b427524c
Added: lucene/dev/trunk/solr/licenses/vorbis-java-tika-0.6.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/vorbis-java-tika-0.6.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/vorbis-java-tika-0.6.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/vorbis-java-tika-0.6.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+be5b08ff4c45632975646f286a1d13e325bec59a
Added: lucene/dev/trunk/solr/licenses/xz-1.5.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/xz-1.5.jar.sha1?rev=1623225&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/xz-1.5.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/xz-1.5.jar.sha1 Sun Sep 7 20:50:13 2014
@@ -0,0 +1 @@
+9c64274b7dbb65288237216e3fae7877fd3f2bee