Author: milamber
Date: Thu Feb 20 08:43:12 2014
New Revision: 1570109
URL: http://svn.apache.org/r1570109
Log:
Updated to tika 1.5 (from 1.4)
Modified:
jmeter/trunk/build.properties
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
jmeter/trunk/lib/aareadme.txt
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1570109&r1=1570108&r2=1570109&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Thu Feb 20 08:43:12 2014
@@ -260,15 +260,15 @@ jtidy.loc = ${maven2.r
jtidy.md5 = 6A9121561B8F98C0A8FB9B6E57F50E6B
# Apache Tika to extract text from various documents
-tika-core.version = 1.4
+tika-core.version = 1.5
tika-core.jar = tika-core-${tika-core.version}.jar
tika-core.loc = ${maven2.repo}/org/apache/tika/tika-core/${tika-core.version}
-tika-core.md5 = ae72caffb94fc6cdc19ddc35c16a82f8
+tika-core.md5 = e864bf637f51283dc525087b015d7b1a
-tika-parsers.version = 1.4
+tika-parsers.version = 1.5
tika-parsers.jar = tika-parsers-${tika-parsers.version}.jar
tika-parsers.loc = ${maven2.repo}/org/apache/tika/tika-parsers/${tika-parsers.version}
-tika-parsers.md5 = 95c3b067d5b3e5a7ddcd1bea4030e263
+tika-parsers.md5 = f1056da5d1021ad1bbac7dab01b335d1
# XStream can be found at: http://xstream.codehaus.org/
xstream.version = 1.4.6
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1570109&r1=1570108&r2=1570109&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Thu Feb 20 08:43:12 2014
@@ -85,8 +85,8 @@
<classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
<classpathentry kind="lib" path="lib/slf4j-nop-1.7.5.jar"/>
<classpathentry kind="lib" path="lib/soap-2.3.1.jar"/>
- <classpathentry kind="lib" path="lib/tika-core-1.4.jar"/>
- <classpathentry kind="lib" path="lib/tika-parsers-1.4.jar"/>
+ <classpathentry kind="lib" path="lib/tika-core-1.5.jar"/>
+ <classpathentry kind="lib" path="lib/tika-parsers-1.5.jar"/>
<classpathentry kind="lib" path="lib/xalan-2.7.1.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl-2.11.0.jar"/>
<classpathentry kind="lib" path="lib/xml-apis-1.4.01.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb 20 08:43:12 2014
@@ -51,5 +51,5 @@ xmlgraphics-commons-1.5.jar
xmlpull-1.1.3.1.jar
xpp3_min-1.1.4c.jar
xstream-1.4.6.jar
-tika-core-1.4.jar
-tika-parsers-1.4.jar
+tika-core-1.5.jar
+tika-parsers-1.5.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1570109&r1=1570108&r2=1570109&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Thu Feb 20 08:43:12 2014
@@ -179,7 +179,7 @@ soap-2.3.1
----------
- WebServiceSampler ONLY
-tika-1.4
+tika-1.5
--------------
http://tika.apache.org/
- Regular Expression Extractor
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1570109&r1=1570108&r2=1570109&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Thu Feb 20 08:43:12 2014
@@ -92,8 +92,8 @@ under the License.
<slf4j-nop.version>1.7.5</slf4j-nop.version>
<soap.version>2.3.1</soap.version>
<jtidy.version>r938</jtidy.version>
- <tika-core.version>1.4</tika-core.version>
- <tika-parsers.version>1.4</tika-parsers.version>
+ <tika-core.version>1.5</tika-core.version>
+ <tika-parsers.version>1.5</tika-parsers.version>
<xmlpull.version>1.1.3.1</xmlpull.version>
<xstream.version>1.4.6</xstream.version>
<xpp3.version>1.1.4c</xpp3.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1570109&r1=1570108&r2=1570109&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Thu Feb 20 08:43:12 2014
@@ -202,6 +202,7 @@ A workaround is to use a Java 7 update 4
<ul>
<li>Updated to commons-lang3 3.2.1 (from 3.1)</li>
<li>Updated to commons-codec 1.9 (from 1.8)</li>
+<li>Updated to tika 1.5 (from 1.4)</li>
<li>Updated to xercesImpl 2.11.0 (from 2.9.1)</li>
<li>Updated to xml-apis 1.4.01 (from 1.3.04)</li>
<li>Updated to xstream 1.4.6 (from 1.4.4)</li>