Author: milamber
Date: Fri Nov 11 08:15:59 2016
New Revision: 1769253
URL: http://svn.apache.org/viewvc?rev=1769253&view=rev
Log:
Updated to tika 1.14
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/build.properties
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
jmeter/trunk/lib/aareadme.txt
jmeter/trunk/licenses/bin/README.txt
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1769253&r1=1769252&r2=1769253&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Fri Nov 11 08:15:59 2016
@@ -232,8 +232,8 @@ The following software is provided under
* logkit-2.0.jar
* serializer-2.7.2.jar
* startbootstrap-sb-admin-2-1.0.7
-* tika-core-1.13.jar
-* tika-parsers-1.13.jar
+* tika-core-1.14.jar
+* tika-parsers-1.14.jar
* xalan-2.7.2.jar
* xerces-2.11.0.jar
* xml-apis-1.4.01.jar
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1769253&r1=1769252&r2=1769253&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Fri Nov 11 08:15:59 2016
@@ -285,15 +285,15 @@ jtidy.loc = ${maven2.r
jtidy.md5 = 6A9121561B8F98C0A8FB9B6E57F50E6B
# Apache Tika to extract text from various documents
-tika-core.version = 1.13
+tika-core.version = 1.14
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 = 74b4e3b970ba2989ebeb9a45857dbe68
+tika-core.md5 = d86a1e930da97345b4130c03e8193f58
-tika-parsers.version = 1.13
+tika-parsers.version = 1.14
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 = 6858c2989b5f19b4b4aed0b9ff83e548
+tika-parsers.md5 = d7e4fe3f91a3fead81a8d29253d7aa71
# XStream can be found at: http://x-stream.github.io
xstream.version = 1.4.9
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1769253&r1=1769252&r2=1769253&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Fri Nov 11 08:15:59 2016
@@ -90,8 +90,8 @@
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.6.0.jar"/>
<classpathentry kind="lib" path="lib/serializer-2.7.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.21.jar"/>
- <classpathentry kind="lib" path="lib/tika-core-1.13.jar"/>
- <classpathentry kind="lib" path="lib/tika-parsers-1.13.jar"/>
+ <classpathentry kind="lib" path="lib/tika-core-1.14.jar"/>
+ <classpathentry kind="lib" path="lib/tika-parsers-1.14.jar"/>
<classpathentry kind="lib" path="lib/xalan-2.7.2.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 Fri Nov 11 08:15:59 2016
@@ -50,8 +50,8 @@ oro-2.0.8.jar
rhino-1.7.7.1.jar
serializer-2.7.2.jar
slf4j-api-1.7.21.jar
-tika-core-1.13.jar
-tika-parsers-1.13.jar
+tika-core-1.14.jar
+tika-parsers-1.14.jar
xalan-2.7.2.jar
xercesImpl-2.11.0.jar
xml-apis-1.4.01.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1769253&r1=1769252&r2=1769253&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Fri Nov 11 08:15:59 2016
@@ -227,7 +227,7 @@ http://www.slf4j.org/
- jodd-core
- json-path
-tika-1.13
+tika-1.14
--------------
http://tika.apache.org/
- Regular Expression Extractor
Modified: jmeter/trunk/licenses/bin/README.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/README.txt?rev=1769253&r1=1769252&r2=1769253&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/README.txt (original)
+++ jmeter/trunk/licenses/bin/README.txt Fri Nov 11 08:15:59 2016
@@ -27,8 +27,8 @@ jorphan.jar (part of JMeter)
logkit-2.0.jar
oro-2.0.8.jar
serializer-2.7.2.jar
-tika-core-1.13.jar
-tika-parsers-1.13.jar
+tika-core-1.14.jar
+tika-parsers-1.14.jar
xalan-2.7.2.jar
xercesImpl-2.11.0.jar
xml-apis-1.4.01.jar
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1769253&r1=1769252&r2=1769253&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Fri Nov 11 08:15:59 2016
@@ -97,8 +97,8 @@ under the License.
<rsyntaxtextarea.version>2.6.0</rsyntaxtextarea.version>
<slf4j-api.version>1.7.21</slf4j-api.version>
<jtidy.version>r938</jtidy.version>
- <tika-core.version>1.13</tika-core.version>
- <tika-parsers.version>1.13</tika-parsers.version>
+ <tika-core.version>1.14</tika-core.version>
+ <tika-parsers.version>1.14</tika-parsers.version>
<xmlpull.version>1.1.3.1</xmlpull.version>
<xstream.version>1.4.9</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=1769253&r1=1769252&r2=1769253&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri Nov 11 08:15:59 2016
@@ -273,7 +273,7 @@ This allows you to update Think Times fr
<ul>
<li>Updated to jsoup-1.10.1 (from 1.8.3)</li>
<li>Updated to ph-css 4.1.6 (from 4.1.4)</li>
- <li>Updated to tika-core and tika-parsers 1.13 (from 1.12)</li>
+ <li>Updated to tika-core and tika-parsers 1.14 (from 1.12)</li>
<li>Updated to commons-io 2.5 (from 2.4)</li>
<li>Updated to commons-lang3 3.5 (from 3.4)</li>
<li>Updated to commons-net 3.5 (from 3.4)</li>
