You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2019/11/09 01:02:36 UTC
[tika] branch master updated (cde4108 -> 19fd9e9)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git.
from cde4108 TIKA-2925: update spring
new b88ccf0 improve readme: 1) to document building a tag and some of the problems that may arise. 2) convert http -> https
new bac63e3 TIKA-2978 -- setter for maxMainMemoryBytes should be of type long
new 19fd9e9 Merge remote-tracking branch 'origin/master'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 53 ++++++++++++++++++----
.../java/org/apache/tika/parser/pdf/PDFParser.java | 4 ++
.../apache/tika/parser/pdf/PDFParserConfig.java | 11 ++++-
.../apache/tika/parser/pdf/tika-inline-config.xml | 2 +-
4 files changed, 58 insertions(+), 12 deletions(-)
[tika] 01/03: improve readme: 1) to document building a tag and
some of the problems that may arise. 2) convert http -> https
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit b88ccf09f4243081560fb258ae245a96019f2315
Author: tallison <ta...@apache.org>
AuthorDate: Tue Oct 29 13:00:38 2019 -0400
improve readme:
1) to document building a tag and some of the
problems that may arise.
2) convert http -> https
---
README.md | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 43 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 85715b0..0838024 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,21 @@
-Welcome to Apache Tika <http://tika.apache.org/>
+Welcome to Apache Tika <https://tika.apache.org/>
=================================================
Apache Tika(TM) is a toolkit for detecting and extracting metadata and structured text content from various documents using existing parser libraries.
-Tika is a project of the [Apache Software Foundation](http://www.apache.org).
+Tika is a project of the [Apache Software Foundation](https://www.apache.org).
Apache Tika, Tika, Apache, the Apache feather logo, and the Apache Tika project logo are trademarks of The Apache Software Foundation.
Getting Started
---------------
-Pre-build binaries of Apache Tika standalone applications are available
-from http://tika.apache.org/download.html . Pre-build binaries of all the
+Pre-built binaries of Apache Tika standalone applications are available
+from https://tika.apache.org/download.html . Pre-built binaries of all the
Tika jars can be fetched from Maven Central or your favourite Maven mirror.
-Tika is based on Java 7 and uses the [Maven 3](http://maven.apache.org) build system. To build Tika from source, use the following command in this directory:
+Tika is based on Java 8 and uses the [Maven 3](https://maven.apache.org) build system.
+To build Tika from source, use the following command in the main directory:
mvn clean install
@@ -25,13 +26,13 @@ The build consists of a number of components, including a standalone runnable ja
Contributing via Github
=======================
To contribute a patch, follow these instructions (note that installing
-[Hub](http://hub.github.com) is not strictly required, but is recommended).
+[Hub](https://hub.github.com) is not strictly required, but is recommended).
```
0. Download and install hub.github.com
1. File JIRA issue for your fix at https://issues.apache.org/jira/browse/TIKA
- you will get issue id TIKA-xxx where xxx is the issue ID.
-2. git clone http://github.com/apache/tika.git
+2. git clone https://github.com/apache/tika.git
3. cd tika
4. git checkout -b TIKA-xxx
5. edit files
@@ -43,6 +44,32 @@ To contribute a patch, follow these instructions (note that installing
11. git pull-request
```
+Building from a Specific Tag
+=======================
+Let's assume that you want to build the 1.22 tag:
+```
+0. Download and install hub.github.com
+1. git clone https://github.com/apache/tika.git
+2. cd tika
+3. git checkout 1.22
+4. mvn clean install
+```
+
+If a new vulnerability has been discovered between the date of the
+tag and the date you are building the tag, you may need to build with:
+
+```
+4. mvn clean install -Dossindex.fail=false
+```
+
+If a local test is not working in your environment, please notify
+ the project at dev@tika.apache.org. As an immediate workaround,
+ you can turn off individual tests with e.g.:
+
+```
+4. mvn clean install -Dossindex.fail=false -Dtest=\!UnpackerResourceTest#testPDFImages
+```
+
License (see also LICENSE.txt)
------------------------------
@@ -50,7 +77,7 @@ Collective work: Copyright 2011 The Apache Software Foundation.
Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to You 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>
+<https://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.
@@ -81,9 +108,15 @@ Notification on all code changes are sent to the following mailing list:
The mailing lists are open to anyone and publicly archived.
-You can subscribe the mailing lists by sending a message to [LIST]-subscribe@tika.apache.org (for example user-subscribe@...). To unsubscribe, send a message to [LIST]-unsubscribe@tika.apache.org. For more instructions, send a message to [LIST]-help@tika.apache.org.
+You can subscribe the mailing lists by sending a message to
+[LIST]-subscribe@tika.apache.org (for example user-subscribe@...).
+To unsubscribe, send a message to [LIST]-unsubscribe@tika.apache.org.
+For more instructions, send a message to [LIST]-help@tika.apache.org.
Issue Tracker
-------------
-If you encounter errors in Tika or want to suggest an improvement or a new feature, please visit the [Tika issue tracker](https://issues.apache.org/jira/browse/TIKA). There you can also find the latest information on known issues and recent bug fixes and enhancements.
+If you encounter errors in Tika or want to suggest an improvement or a new feature,
+ please visit the [Tika issue tracker](https://issues.apache.org/jira/browse/TIKA).
+ There you can also find the latest information on known issues and
+ recent bug fixes and enhancements.
[tika] 02/03: TIKA-2978 -- setter for maxMainMemoryBytes should be
of type long
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit bac63e33af4a7a934654839eac64f4291692f129
Author: tallison <ta...@apache.org>
AuthorDate: Fri Nov 8 13:53:09 2019 -0500
TIKA-2978 -- setter for maxMainMemoryBytes should be of type long
---
.../src/main/java/org/apache/tika/parser/pdf/PDFParser.java | 4 ++++
.../main/java/org/apache/tika/parser/pdf/PDFParserConfig.java | 11 ++++++++++-
.../org/apache/tika/parser/pdf/tika-inline-config.xml | 2 +-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
index e52311b..ed72597 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
@@ -517,6 +517,10 @@ public class PDFParser extends AbstractParser implements Initializable {
this.initializableProblemHandler = initializableProblemHandler;
}
+ @Field
+ public void setMaxMainMemoryBytes(long maxMainMemoryBytes) {
+ defaultConfig.setMaxMainMemoryBytes(maxMainMemoryBytes);
+ }
/**
* This is a no-op. There is no need to initialize multiple fields.
* The regular field loading should happen without this.
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParserConfig.java b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParserConfig.java
index 382af86..196c5ce 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParserConfig.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParserConfig.java
@@ -232,7 +232,7 @@ public class PDFParserConfig implements Serializable {
accessChecker = new AccessChecker(allowExtractionForAccessibility);
}
- maxMainMemoryBytes = getIntProp(props.getProperty("maxMainMemoryBytes"), -1);
+ maxMainMemoryBytes = getLongProp(props.getProperty("maxMainMemoryBytes"), -1);
detectAngles = getBooleanProp(props.getProperty("detectAngles"), false);
}
@@ -677,10 +677,19 @@ public class PDFParserConfig implements Serializable {
return maxMainMemoryBytes;
}
+ /**
+ * @deprecated use {@link #setMaxMainMemoryBytes(long)}
+ * @param maxMainMemoryBytes
+ */
+ @Deprecated
public void setMaxMainMemoryBytes(int maxMainMemoryBytes) {
this.maxMainMemoryBytes = maxMainMemoryBytes;
}
+ public void setMaxMainMemoryBytes(long maxMainMemoryBytes) {
+ this.maxMainMemoryBytes = maxMainMemoryBytes;
+ }
+
/**
* <p>
* Whether to call <code>System.setProperty("sun.java2d.cmm", "sun.java2d.cmm.kcms.KcmsServiceProvider")</code>.
diff --git a/tika-parsers/src/test/resources/org/apache/tika/parser/pdf/tika-inline-config.xml b/tika-parsers/src/test/resources/org/apache/tika/parser/pdf/tika-inline-config.xml
index d0bf627..5ba36dc 100644
--- a/tika-parsers/src/test/resources/org/apache/tika/parser/pdf/tika-inline-config.xml
+++ b/tika-parsers/src/test/resources/org/apache/tika/parser/pdf/tika-inline-config.xml
@@ -31,7 +31,7 @@
<param name="ocrImageQuality" type="float">2.1</param>
<param name="ocrImageFormatName" type="string">jpeg</param>
<param name="ocrImageScale" type="float">1.3</param>
- <param name="maxMainMemoryBytes" type="int">524288000</param>
+ <param name="maxMainMemoryBytes" type="long">524288000</param>
<!-- we really should throw an exception for this!! -->
<param name="someRandomThingOrOther" type="bool">true</param>
</params>
[tika] 03/03: Merge remote-tracking branch 'origin/master'
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 19fd9e94f376170052c5cd096f5ac3f991a0b3f1
Merge: bac63e3 cde4108
Author: tallison <ta...@apache.org>
AuthorDate: Fri Nov 8 20:02:27 2019 -0500
Merge remote-tracking branch 'origin/master'
tika-dl/pom.xml | 4 ++--
tika-example/pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)