Author: nick
Date: Sat Aug 15 17:57:29 2015
New Revision: 1696079
URL: http://svn.apache.org/r1696079
Log:
Use a consistent version of Commons IO everywhere, enable the Forbidden APIs
check for it, and fix problems it found TIKA-1706
Modified:
tika/trunk/tika-app/pom.xml
tika/trunk/tika-batch/pom.xml
tika/trunk/tika-example/pom.xml
tika/trunk/tika-example/src/main/java/org/apache/tika/example/DirListParser.java
tika/trunk/tika-example/src/main/java/org/apache/tika/example/MyFirstTika.java
tika/trunk/tika-example/src/main/java/org/apache/tika/example/RollbackSoftware.java
tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java
tika/trunk/tika-parent/pom.xml
tika/trunk/tika-parsers/pom.xml
tika/trunk/tika-server/pom.xml
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
Modified: tika/trunk/tika-app/pom.xml
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-app/pom.xml?rev=1696079&r1=1696078&r2=1696079&view=diff
==============================================================================
--- tika/trunk/tika-app/pom.xml (original)
+++ tika/trunk/tika-app/pom.xml Sat Aug 15 17:57:29 2015
@@ -94,7 +94,7 @@
<dependency>
<artifactId>commons-io</artifactId>
<groupId>commons-io</groupId>
- <version>2.4</version>
+ <version>${commons.io.version}</version>
</dependency>
</dependencies>
Modified: tika/trunk/tika-batch/pom.xml
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-batch/pom.xml?rev=1696079&r1=1696078&r2=1696079&view=diff
==============================================================================
--- tika/trunk/tika-batch/pom.xml (original)
+++ tika/trunk/tika-batch/pom.xml Sat Aug 15 17:57:29 2015
@@ -89,7 +89,7 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
- <version>2.1</version>
+ <version>${commons.io.version}</version>
</dependency>
</dependencies>
Modified: tika/trunk/tika-example/pom.xml
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-example/pom.xml?rev=1696079&r1=1696078&r2=1696079&view=diff
==============================================================================
--- tika/trunk/tika-example/pom.xml (original)
+++ tika/trunk/tika-example/pom.xml Sat Aug 15 17:57:29 2015
@@ -92,7 +92,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>${commons.io.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified:
tika/trunk/tika-example/src/main/java/org/apache/tika/example/DirListParser.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-example/src/main/java/org/apache/tika/example/DirListParser.java?rev=1696079&r1=1696078&r2=1696079&view=diff
==============================================================================
---
tika/trunk/tika-example/src/main/java/org/apache/tika/example/DirListParser.java
(original)
+++
tika/trunk/tika-example/src/main/java/org/apache/tika/example/DirListParser.java
Sat Aug 15 17:57:29 2015
@@ -75,8 +75,8 @@ public class DirListParser implements Pa
Metadata metadata, ParseContext context) throws
IOException,
SAXException, TikaException {
- List<String> lines = FileUtils.readLines(TikaInputStream.get(is)
- .getFile());
+ List<String> lines = FileUtils.readLines(
+ TikaInputStream.get(is).getFile(), "utf-8");
for (String line : lines) {
String[] fileToks = line.split("\\s+");
if (fileToks.length < 8)
Modified:
tika/trunk/tika-example/src/main/java/org/apache/tika/example/MyFirstTika.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-example/src/main/java/org/apache/tika/example/MyFirstTika.java?rev=1696079&r1=1696078&r2=1696079&view=diff
==============================================================================
---
tika/trunk/tika-example/src/main/java/org/apache/tika/example/MyFirstTika.java
(original)
+++
tika/trunk/tika-example/src/main/java/org/apache/tika/example/MyFirstTika.java
Sat Aug 15 17:57:29 2015
@@ -91,7 +91,7 @@ public class MyFirstTika {
+ detector.detect(stream, metadata) + "]");
LanguageIdentifier lang = new LanguageIdentifier(new LanguageProfile(
- FileUtils.readFileToString(new File(filename))));
+ FileUtils.readFileToString(new File(filename), "utf-8")));
System.out.println("The language of this content is: ["
+ lang.getLanguage() + "]");
Modified:
tika/trunk/tika-example/src/main/java/org/apache/tika/example/RollbackSoftware.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-example/src/main/java/org/apache/tika/example/RollbackSoftware.java?rev=1696079&r1=1696078&r2=1696079&view=diff
==============================================================================
---
tika/trunk/tika-example/src/main/java/org/apache/tika/example/RollbackSoftware.java
(original)
+++
tika/trunk/tika-example/src/main/java/org/apache/tika/example/RollbackSoftware.java
Sat Aug 15 17:57:29 2015
@@ -40,7 +40,6 @@ import org.xml.sax.SAXException;
/**
* Demonstrates Tika and its ability to sense symlinks.
*/
-@SuppressWarnings("deprecation")
public class RollbackSoftware {
public static void main(String[] args) throws Exception {
@@ -53,7 +52,7 @@ public class RollbackSoftware {
LinkContentHandler handler = new LinkContentHandler();
Metadata met = new Metadata();
DeploymentAreaParser parser = new DeploymentAreaParser();
-
parser.parse(IOUtils.toInputStream(deployArea.getAbsolutePath()),
+
parser.parse(IOUtils.toInputStream(deployArea.getAbsolutePath(), "utf-8"),
handler, met);
List<Link> links = handler.getLinks();
if (links.size() < 2)
@@ -111,7 +110,7 @@ public class RollbackSoftware {
Metadata metadata, ParseContext context) throws
IOException,
SAXException, TikaException {
- File deployArea = new File(IOUtils.toString(is));
+ File deployArea = new File(IOUtils.toString(is,
"utf-8"));
File[] versions = deployArea.listFiles(new FileFilter()
{
public boolean accept(File pathname) {
Modified:
tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java?rev=1696079&r1=1696078&r2=1696079&view=diff
==============================================================================
---
tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java
(original)
+++
tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java
Sat Aug 15 17:57:29 2015
@@ -25,9 +25,7 @@ import org.junit.Test;
import com.google.common.base.Charsets;
-@SuppressWarnings("deprecation")
public class SimpleTextExtractorTest {
-
@Test
public void testSimpleTextExtractor() throws Exception {
String message =
@@ -40,7 +38,7 @@ public class SimpleTextExtractorTest {
System.setOut(new PrintStream(buffer, true, Charsets.UTF_8.name()));
File file = new File("target", "test.txt");
- FileUtils.writeStringToFile(file, message);
+ FileUtils.writeStringToFile(file, message, "utf-8");
SimpleTextExtractor.main(new String[] { file.getPath() });
file.delete();
@@ -48,5 +46,4 @@ public class SimpleTextExtractorTest {
assertEquals(message, buffer.toString(Charsets.UTF_8.name()).trim());
}
-
}
Modified: tika/trunk/tika-parent/pom.xml
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parent/pom.xml?rev=1696079&r1=1696078&r2=1696079&view=diff
==============================================================================
--- tika/trunk/tika-parent/pom.xml (original)
+++ tika/trunk/tika-parent/pom.xml Sat Aug 15 17:57:29 2015
@@ -301,6 +301,7 @@
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
+ <commons.io.version>2.4</commons.io.version>
<slf4j.version>1.7.12</slf4j.version>
</properties>
@@ -317,14 +318,16 @@
<plugin>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<configuration>
<targetVersion>${maven.compiler.target}</targetVersion>
<internalRuntimeForbidden>true</internalRuntimeForbidden>
+ <failOnUnresolvableSignatures>false</failOnUnresolvableSignatures>
<failOnUnsupportedJava>false</failOnUnsupportedJava>
<bundledSignatures>
<bundledSignature>jdk-unsafe</bundledSignature>
<bundledSignature>jdk-deprecated</bundledSignature>
+
<bundledSignature>commons-io-unsafe-${commons.io.version}</bundledSignature>
</bundledSignatures>
</configuration>
<executions>
Modified: tika/trunk/tika-parsers/pom.xml
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/pom.xml?rev=1696079&r1=1696078&r2=1696079&view=diff
==============================================================================
--- tika/trunk/tika-parsers/pom.xml (original)
+++ tika/trunk/tika-parsers/pom.xml Sat Aug 15 17:57:29 2015
@@ -249,7 +249,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>${commons.io.version}</version>
</dependency>
<dependency>
Modified: tika/trunk/tika-server/pom.xml
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/pom.xml?rev=1696079&r1=1696078&r2=1696079&view=diff
==============================================================================
--- tika/trunk/tika-server/pom.xml (original)
+++ tika/trunk/tika-server/pom.xml Sat Aug 15 17:57:29 2015
@@ -105,7 +105,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>${commons.io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java?rev=1696079&r1=1696078&r2=1696079&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TranslateResource.java
Sat Aug 15 17:57:29 2015
@@ -62,7 +62,7 @@ public class TranslateResource {
@PathParam("translator") String translator,
@PathParam("src") String sLang, @PathParam("dest")
String dLang)
throws TikaException, IOException {
- return doTranslate(IOUtils.toString(is), translator, sLang,
dLang);
+ return doTranslate(IOUtils.toString(is, "utf-8"), translator,
sLang, dLang);
}
@@ -74,7 +74,7 @@ public class TranslateResource {
public String autoTranslate(final InputStream is,
@PathParam("translator") String translator,
@PathParam("dest") String dLang) throws TikaException,
IOException {
- final String content = IOUtils.toString(is);
+ final String content = IOUtils.toString(is, "utf-8");
LanguageIdentifier language = new LanguageIdentifier(
new LanguageProfile(content));
String sLang = language.getLanguage();
