Author: milamber
Date: Thu Apr 26 06:49:19 2018
New Revision: 1830144
URL: http://svn.apache.org/viewvc?rev=1830144&view=rev
Log:
Updated to Apache Tika 1.18
Added:
jmeter/trunk/lib/tika-app-1.18.jar (with props)
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=1830144&r1=1830143&r2=1830144&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Thu Apr 26 06:49:19 2018
@@ -237,8 +237,8 @@ The following software is provided under
* log4j-slf4j-impl-2.10.0.jar
* serializer-2.7.2.jar
* startbootstrap-sb-admin-2-1.0.7
-* tika-core-1.17.jar
-* tika-parsers-1.17.jar
+* tika-core-1.18.jar
+* tika-parsers-1.18.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=1830144&r1=1830143&r2=1830144&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Thu Apr 26 06:49:19 2018
@@ -351,15 +351,15 @@ jtidy.loc = ${maven2.r
jtidy.md5 = 6A9121561B8F98C0A8FB9B6E57F50E6B
# Apache Tika to extract text from various documents
-tika-core.version = 1.17
+tika-core.version = 1.18
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 = dc1ba32dd6647a99822cf91e9c6a249d
+tika-core.md5 = 2c318d82d76db77902d71d143a88973f
-tika-parsers.version = 1.17
+tika-parsers.version = 1.18
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 = 1ed1107da299a57372c21eed26cfec0d
+tika-parsers.md5 = 78b1ecd14d44aaae25481d5c473eda7f
# XStream can be found at: http://x-stream.github.io
xstream.version = 1.4.10
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1830144&r1=1830143&r2=1830144&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Thu Apr 26 06:49:19 2018
@@ -100,8 +100,8 @@
<classpathentry kind="lib" path="lib/serializer-2.7.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.25.jar"/>
<classpathentry kind="lib" path="lib/slf4j-ext-1.7.25.jar"/>
- <classpathentry kind="lib" path="lib/tika-core-1.17.jar"/>
- <classpathentry kind="lib" path="lib/tika-parsers-1.17.jar"/>
+ <classpathentry kind="lib" path="lib/tika-core-1.18.jar"/>
+ <classpathentry kind="lib" path="lib/tika-parsers-1.18.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 Thu Apr 26 06:49:19 2018
@@ -64,8 +64,8 @@ serializer-2.7.2.jar
slf4j-api-1.7.25.jar
slf4j-ext-1.7.25.jar
spock-core-1.0-groovy-2.4.jar
-tika-core-1.17.jar
-tika-parsers-1.17.jar
+tika-core-1.18.jar
+tika-parsers-1.18.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=1830144&r1=1830143&r2=1830144&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Thu Apr 26 06:49:19 2018
@@ -240,7 +240,7 @@ http://www.slf4j.org/
- jodd-core
- json-path
-tika-1.17
+tika-1.18
--------------
http://tika.apache.org/
- Regular Expression Extractor
Added: jmeter/trunk/lib/tika-app-1.18.jar
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/tika-app-1.18.jar?rev=1830144&view=auto
==============================================================================
Binary file - no diff available.
Propchange: jmeter/trunk/lib/tika-app-1.18.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: jmeter/trunk/licenses/bin/README.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/README.txt?rev=1830144&r1=1830143&r2=1830144&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/README.txt (original)
+++ jmeter/trunk/licenses/bin/README.txt Thu Apr 26 06:49:19 2018
@@ -26,8 +26,8 @@ jorphan.jar (part of JMeter)
logkit-2.0.jar
oro-2.0.8.jar
serializer-2.7.2.jar
-tika-core-1.17.jar
-tika-parsers-1.17.jar
+tika-core-1.18.jar
+tika-parsers-1.18.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=1830144&r1=1830143&r2=1830144&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Thu Apr 26 06:49:19 2018
@@ -109,8 +109,8 @@ under the License.
<cglib-nodep.version>3.2.6</cglib-nodep.version>
<objenesis.version>2.6</objenesis.version>
<jtidy.version>r938</jtidy.version>
- <tika-core.version>1.17</tika-core.version>
- <tika-parsers.version>1.17</tika-parsers.version>
+ <tika-core.version>1.18</tika-core.version>
+ <tika-parsers.version>1.18</tika-parsers.version>
<xmlpull.version>1.1.3.1</xmlpull.version>
<xstream.version>1.4.10</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=1830144&r1=1830143&r2=1830144&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Apr 26 06:49:19 2018
@@ -155,6 +155,7 @@ this behaviour, set <code>httpclient.res
<li><bug>62171</bug>Remove .md5 checksums and keep only .sha512 checksums for source and binary archives</li>
<li>Updated to groovy-all-2.4.14 (from groovy-all-2.4.13)</li>
<li>Updated to asm-6.1 (from 6.1)</li>
+ <li>Updated to tika-core and tika-parsers 1.18 (from 1.17)</li>
</ul>
<!-- =================== Bug fixes =================== -->