mirror of https://github.com/apache/lucene.git
SOLR-12423: Upgrade to Tika 1.19.1 when available. Fixes #468
This commit is contained in:
Erick Erickson
parent
11a1b8c1a8
commit
fc886497de
|
|
@ -12,9 +12,11 @@ com.carrotsearch.randomizedtesting.version = 2.6.4
|
|||
/com.carrotsearch/hppc = 0.8.1
|
||||
|
||||
/com.cybozu.labs/langdetect = 1.1-20120112
|
||||
/com.drewnoakes/metadata-extractor = 2.10.1
|
||||
/com.drewnoakes/metadata-extractor = 2.11.0
|
||||
|
||||
com.fasterxml.jackson.core.version = 2.9.5
|
||||
/com.epam/parso = 2.0.9
|
||||
|
||||
com.fasterxml.jackson.core.version = 2.9.6
|
||||
/com.fasterxml.jackson.core/jackson-annotations = ${com.fasterxml.jackson.core.version}
|
||||
/com.fasterxml.jackson.core/jackson-core = ${com.fasterxml.jackson.core.version}
|
||||
/com.fasterxml.jackson.core/jackson-databind = ${com.fasterxml.jackson.core.version}
|
||||
|
|
@ -27,8 +29,8 @@ com.fasterxml.jackson.core.version = 2.9.5
|
|||
|
||||
/com.google.protobuf/protobuf-java = 3.1.0
|
||||
/com.googlecode.juniversalchardet/juniversalchardet = 1.0.3
|
||||
/com.googlecode.mp4parser/isoparser = 1.1.18
|
||||
/com.healthmarketscience.jackcess/jackcess = 2.1.10
|
||||
/com.googlecode.mp4parser/isoparser = 1.1.22
|
||||
/com.healthmarketscience.jackcess/jackcess = 2.1.12
|
||||
/com.healthmarketscience.jackcess/jackcess-encrypt = 2.1.4
|
||||
/com.ibm.icu/icu4j = 62.1
|
||||
/com.lmax/disruptor = 3.4.0
|
||||
|
|
@ -47,7 +49,7 @@ com.sun.jersey.version = 1.9
|
|||
/com.tdunning/t-digest = 3.1
|
||||
/com.vaadin.external.google/android-json = 0.0.20131108.vaadin1
|
||||
/commons-cli/commons-cli = 1.2
|
||||
/commons-codec/commons-codec = 1.10
|
||||
/commons-codec/commons-codec = 1.11
|
||||
/commons-collections/commons-collections = 3.2.2
|
||||
/commons-configuration/commons-configuration = 1.6
|
||||
/commons-fileupload/commons-fileupload = 1.3.3
|
||||
|
|
@ -106,7 +108,7 @@ org.apache.calcite.version = 1.13.0
|
|||
/org.apache.calcite/calcite-core = ${org.apache.calcite.version}
|
||||
/org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version}
|
||||
|
||||
/org.apache.commons/commons-collections4 = 4.1
|
||||
/org.apache.commons/commons-collections4 = 4.2
|
||||
/org.apache.commons/commons-compress = 1.18
|
||||
/org.apache.commons/commons-exec = 1.3
|
||||
/org.apache.commons/commons-lang3 = 3.6
|
||||
|
|
@ -169,7 +171,7 @@ org.apache.hadoop.version = 2.7.4
|
|||
|
||||
/org.apache.ivy/ivy = 2.4.0
|
||||
|
||||
org.apache.james.apache.mime4j.version = 0.8.1
|
||||
org.apache.james.apache.mime4j.version = 0.8.2
|
||||
/org.apache.james/apache-mime4j-core = ${org.apache.james.apache.mime4j.version}
|
||||
/org.apache.james/apache-mime4j-dom = ${org.apache.james.apache.mime4j.version}
|
||||
|
||||
|
|
@ -183,19 +185,19 @@ org.apache.logging.log4j.version = 2.11.0
|
|||
|
||||
/org.apache.opennlp/opennlp-tools = 1.9.0
|
||||
|
||||
org.apache.pdfbox.version = 2.0.9
|
||||
org.apache.pdfbox.version = 2.0.12
|
||||
/org.apache.pdfbox/fontbox = ${org.apache.pdfbox.version}
|
||||
/org.apache.pdfbox/jempbox = 1.8.13
|
||||
/org.apache.pdfbox/jempbox = 1.8.16
|
||||
/org.apache.pdfbox/pdfbox = ${org.apache.pdfbox.version}
|
||||
/org.apache.pdfbox/pdfbox-tools = ${org.apache.pdfbox.version}
|
||||
|
||||
org.apache.poi.version = 3.17
|
||||
org.apache.poi.version = 4.0.0
|
||||
/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.18
|
||||
org.apache.tika.version = 1.19.1
|
||||
/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}
|
||||
|
|
@ -203,7 +205,7 @@ org.apache.tika.version = 1.18
|
|||
|
||||
/org.apache.velocity/velocity = 1.7
|
||||
/org.apache.velocity/velocity-tools = 2.0
|
||||
/org.apache.xmlbeans/xmlbeans = 2.6.0
|
||||
/org.apache.xmlbeans/xmlbeans = 3.0.1
|
||||
/org.apache.zookeeper/zookeeper = 3.4.11
|
||||
|
||||
# v1.6.0-alpha.5 of asciidoctor-ant includes asciidoctorj-pdf 1.5.0-alpha.16,
|
||||
|
|
@ -212,11 +214,13 @@ org.apache.tika.version = 1.18
|
|||
|
||||
/org.aspectj/aspectjrt = 1.8.0
|
||||
|
||||
org.bouncycastle.version = 1.54
|
||||
org.bouncycastle.version = 1.60
|
||||
/org.bouncycastle/bcmail-jdk15on = ${org.bouncycastle.version}
|
||||
/org.bouncycastle/bcpkix-jdk15on = ${org.bouncycastle.version}
|
||||
/org.bouncycastle/bcprov-jdk15on = ${org.bouncycastle.version}
|
||||
|
||||
/org.brotli/dec = 0.1.2
|
||||
|
||||
/org.carrot2.attributes/attributes-binder = 1.3.3
|
||||
/org.carrot2.shaded/carrot2-guava = 18.0
|
||||
|
||||
|
|
@ -263,7 +267,7 @@ org.gagravarr.vorbis.java.version = 0.8
|
|||
/org.hsqldb/hsqldb = 2.4.0
|
||||
/org.jdom/jdom2 = 2.0.6
|
||||
|
||||
/org.jsoup/jsoup = 1.11.2
|
||||
/org.jsoup/jsoup = 1.11.3
|
||||
|
||||
/org.locationtech.jts/jts-core = 1.15.0
|
||||
/org.locationtech.spatial4j/spatial4j = 0.7
|
||||
|
|
@ -296,7 +300,7 @@ org.slf4j.version = 1.7.24
|
|||
/org.slf4j/slf4j-api = ${org.slf4j.version}
|
||||
/org.slf4j/slf4j-simple = ${org.slf4j.version}
|
||||
|
||||
/org.tallison/jmatio = 1.2
|
||||
/org.tallison/jmatio = 1.5
|
||||
/org.tukaani/xz = 1.8
|
||||
|
||||
ua.net.nlp.morfologik-ukrainian-search.version = 3.9.0
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
4b95f4897fa13f2cd904aee711aeafc0c5295cd8
|
||||
|
|
@ -0,0 +1 @@
|
|||
3acb4705652e16236558f0f4f2192cc33c3bd189
|
||||
|
|
@ -22,7 +22,7 @@ Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this r
|
|||
|
||||
Versions of Major Components
|
||||
---------------------
|
||||
Apache Tika 1.18
|
||||
Apache Tika 1.19.1
|
||||
Carrot2 3.16.0
|
||||
Velocity 1.7 and Velocity Tools 2.0
|
||||
Apache ZooKeeper 3.4.11
|
||||
|
|
@ -163,6 +163,8 @@ Other Changes
|
|||
|
||||
* SOLR-12835: Document statistics exposed by the Query Result Cache when maxRamMB is configured. (shalin)
|
||||
|
||||
* SOLR-12423: Upgrade to Tika 1.19.1 when available (Tim Allison via Erick Erickson)
|
||||
|
||||
Bug Fixes
|
||||
----------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -67,6 +67,8 @@
|
|||
<dependency org="com.adobe.xmp" name="xmpcore" rev="${/com.adobe.xmp/xmpcore}" conf="compile"/>
|
||||
<dependency org="com.pff" name="java-libpst" rev="${/com.pff/java-libpst}" conf="compile"/>
|
||||
<dependency org="org.tallison" name="jmatio" rev="${/org.tallison/jmatio}" conf="compile"/>
|
||||
<dependency org="com.epam" name="parso" rev="${/com.epam/parso}" conf="compile"/>
|
||||
<dependency org="org.brotli" name="dec" rev="${/org.brotli/dec}" conf="compile"/>
|
||||
|
||||
<!-- Other ExtractingRequestHandler dependencies -->
|
||||
<dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" conf="compile"/>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
c62dfe18a3b827a2c626ade0ffba44562ddf3f61
|
||||
|
|
@ -0,0 +1 @@
|
|||
94919d81969c67c5894646338bf10fbc35f5a946
|
||||
|
|
@ -1 +0,0 @@
|
|||
f2d653c617004193f3350330d907f77b60c88c56
|
||||
|
|
@ -0,0 +1 @@
|
|||
32c9a9afe84eca86a3b0b3c66a956ced249ceade
|
||||
|
|
@ -1 +0,0 @@
|
|||
9d9b5432b4b29ef4a853223bc6e19379ef116cca
|
||||
|
|
@ -0,0 +1 @@
|
|||
df0250131a6e85e546ec5b1bf964f7f2ff3a42fc
|
||||
|
|
@ -1 +0,0 @@
|
|||
b11bfee99bb11eea344de6e4a07fe89212c55c02
|
||||
|
|
@ -0,0 +1 @@
|
|||
d0c46320fbc07be3a24eb13a56cee4e3d38e0c75
|
||||
|
|
@ -1 +0,0 @@
|
|||
1acdedeb89f1d950d67b73d481eb7736df65eedb
|
||||
|
|
@ -0,0 +1 @@
|
|||
bd47ad3bd14b8e82595c7adaa143501e60842a84
|
||||
|
|
@ -1 +0,0 @@
|
|||
4b95f4897fa13f2cd904aee711aeafc0c5295cd8
|
||||
|
|
@ -0,0 +1 @@
|
|||
3acb4705652e16236558f0f4f2192cc33c3bd189
|
||||
|
|
@ -1 +0,0 @@
|
|||
a4cf4688fe1c7e3a63aa636cc96d013af537768e
|
||||
|
|
@ -0,0 +1 @@
|
|||
54ebea0a5b653d3c680131e73fe807bb8f78c4ed
|
||||
|
|
@ -0,0 +1 @@
|
|||
0c26a897ae0d524809eef1c786cc6183b4ddcc3b
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
|
@ -0,0 +1 @@
|
|||
566fd1d6b25012bb82078da08b82e6d0ba8c884a
|
||||
|
|
@ -1 +0,0 @@
|
|||
f961f17ebdbc307e9055e3cf7c0e207f0895ae55
|
||||
|
|
@ -1 +0,0 @@
|
|||
c74bdac64b22f1e245a7657149a43437aae4a9d3
|
||||
|
|
@ -0,0 +1 @@
|
|||
70b5c26b52c120d2e94643717a764c4a67640fd6
|
||||
|
|
@ -1 +0,0 @@
|
|||
4a10b9316831c2fc1f87853bb6745909dab5a8a5
|
||||
|
|
@ -0,0 +1 @@
|
|||
8a422b016925475b2234b576a0f7ee3f55f1f9e2
|
||||
|
|
@ -1 +0,0 @@
|
|||
9056ec9db21c57d43219a84bb18c129ae51c6a5d
|
||||
|
|
@ -0,0 +1 @@
|
|||
6a0f0f154edaba00067772ce02e24f8c0973d84c
|
||||
|
|
@ -1 +0,0 @@
|
|||
a22ac51016944b06fd9ffbc9541c6e7ce5eea117
|
||||
|
|
@ -0,0 +1 @@
|
|||
4e393793c37c77e042ccc7be5a914ae39251b365
|
||||
|
|
@ -1 +0,0 @@
|
|||
3490508379d065fe3fcb80042b62f630f7588606
|
||||
|
|
@ -0,0 +1 @@
|
|||
cfa4f316351a91bfd95cb0644c6a2c95f52db1fc
|
||||
|
|
@ -1 +0,0 @@
|
|||
dbc8efaf5c70004dfb4ac5db6fa7e12534ada22d
|
||||
|
|
@ -0,0 +1 @@
|
|||
3b5afd355921c359e365accaa60f7f30709e35e7
|
||||
|
|
@ -1 +0,0 @@
|
|||
a874cef0ed0e2a8c4cc5ed52c23ba3e6d78eca4e
|
||||
|
|
@ -0,0 +1 @@
|
|||
1f41de81768ef84ca2d8cda4cb79e9272c8ee966
|
||||
|
|
@ -1 +0,0 @@
|
|||
69d8f2f49c1503f9b15b0eb50b1905a734a025e2
|
||||
|
|
@ -0,0 +1 @@
|
|||
517d932cc87a3b564f3f7a07ac347b725b619ab4
|
||||
|
|
@ -1 +0,0 @@
|
|||
e3eeb8a0b4ce1db246059a41e353cd7413dad226
|
||||
|
|
@ -0,0 +1 @@
|
|||
36da09a8f68484523fa2aaa100399d612b247d67
|
||||
|
|
@ -1 +0,0 @@
|
|||
e1852a8f519dbb0196fdb41bf2c584a8858189f8
|
||||
|
|
@ -0,0 +1 @@
|
|||
5f11883f6d06a16ca5fb8a9edf7c6c1237a92da0
|
||||
|
|
@ -0,0 +1 @@
|
|||
615d910051b7c4695397e6686cf840caf6216e19
|
||||
|
|
@ -0,0 +1,234 @@
|
|||
|
||||
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.
|
||||
CONTRIBUTIONS TO THE ORIGINAL CODEBASE
|
||||
|
||||
Apache FontBox is based on contributions made to the original FontBox project:
|
||||
|
||||
Copyright (c) 2006-2007, www.fontbox.org
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
|
||||
2. 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.
|
||||
|
||||
3. Neither the name of fontbox; 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 REGENTS 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.
|
||||
|
|
@ -0,0 +1,234 @@
|
|||
|
||||
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.
|
||||
CONTRIBUTIONS TO THE ORIGINAL CODEBASE
|
||||
|
||||
Apache FontBox is based on contributions made to the original FontBox project:
|
||||
|
||||
Copyright (c) 2006-2007, www.fontbox.org
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
|
||||
2. 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.
|
||||
|
||||
3. Neither the name of fontbox; 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 REGENTS 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.
|
||||
|
|
@ -0,0 +1 @@
|
|||
a7311cd267c19e1ba8154b076a63d29537154784
|
||||
|
|
@ -1 +0,0 @@
|
|||
d0425578218624388f2ec84a0b3a11efd55df0f5
|
||||
|
|
@ -0,0 +1 @@
|
|||
0e4569e8364f33be1c0af889f62b0f8f4dca7d45
|
||||
|
|
@ -1 +0,0 @@
|
|||
90a58b4daf37697488339845e0a3e0d3609eb781
|
||||
|
|
@ -1 +0,0 @@
|
|||
0ae92292a2043888b40d418da97dc0b669fde326
|
||||
|
|
@ -0,0 +1 @@
|
|||
7ddb9b983ed682c93a986e8bb596d5935b13086c
|
||||
|
|
@ -1 +0,0 @@
|
|||
07d8c44407178b73246462842bf1e206e99c8e0a
|
||||
|
|
@ -0,0 +1 @@
|
|||
f3fa9c2bd64eb3ec15378de960a07d077ae5b26d
|
||||
|
|
@ -1 +0,0 @@
|
|||
890114bfa82f5b6380ea0e9b0bf49b0af797b414
|
||||
|
|
@ -0,0 +1 @@
|
|||
125f9ccd2cf652fa4169b1c30e9023362e23324f
|
||||
|
|
@ -1 +0,0 @@
|
|||
85d86a0e26c7f5c0db4ee63e8c7728e51c5d64ce
|
||||
|
|
@ -0,0 +1 @@
|
|||
1038d3bb1ec34e93c184b4c5b690e2f51c6f7a60
|
||||
|
|
@ -1 +0,0 @@
|
|||
69556697de96cf0b22df846e970dafd29866eee0
|
||||
|
|
@ -0,0 +1 @@
|
|||
c1f075aa01586c2c28a249ad60bcfb733b69b866
|
||||
|
|
@ -1 +0,0 @@
|
|||
07891212df835f740be0ca92040280915b0cd9d4
|
||||
|
|
@ -0,0 +1 @@
|
|||
02661fd12fd9f0223e522dca72c1296108561263
|
||||
|
|
@ -1 +0,0 @@
|
|||
7d9b6dea91d783165f3313d320d3aaaa9a4dfc13
|
||||
|
|
@ -0,0 +1 @@
|
|||
06d45a8683a7479f0e0d9d252f834d0ae44abd6b
|
||||
|
|
@ -1 +0,0 @@
|
|||
85eb7fbe700291159ea8c072e8158f1beb5f66ab
|
||||
|
|
@ -0,0 +1 @@
|
|||
3b1bb7e00262813b3ef08b414fa0d5d06c45f2bb
|
||||
|
|
@ -1 +0,0 @@
|
|||
29e80d2dd51f9dcdef8f9ffaee0d4dc1c9bbfc87
|
||||
|
|
@ -0,0 +1 @@
|
|||
50d94da791ab1e799a11d6f82410fd7d49f402ca
|
||||
Loading…
Reference in New Issue