Updated to tika 1.21

milamberspace · milamberspace · commit 9ed47da30b2e · 2019-05-22T00:29:57.000Z
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1859681 13f79535-47bb-0310-9956-ffa450edef68 Former-commit-id: b7373fe
diff --git a/LICENSE b/LICENSE
@@ -238,8 +238,8 @@ The following software is provided under the Apache License V 2.0 (as above):
 * log4j-slf4j-impl-2.11.1.jar
 * serializer-2.7.2.jar
 * startbootstrap-sb-admin-2-1.0.7
-* tika-core-1.20.jar
-* tika-parsers-1.20.jar
+* tika-core-1.21.jar
+* tika-parsers-1.21.jar
 * xalan-2.7.2.jar
 * xerces-2.12.0.jar
 * xml-apis-1.4.01.jar
diff --git a/build.properties b/build.properties
@@ -366,15 +366,15 @@ jtidy.loc                   = ${maven2.repo}/net/sf/jtidy/jtidy/${jtidy.version}
 jtidy.sha512                = 4C6CC198BD8CDE62B6CC9091ED95A4114EAAD035C196317C891F8F2263B28649A33B1F26F74F2B043A17CEC2A3D025EDA81ACF317FDF2D04641FA646E486B345
 
 # Apache Tika to extract text from various documents
-tika-core.version           = 1.20
+tika-core.version           = 1.21
 tika-core.jar               = tika-core-${tika-core.version}.jar
 tika-core.loc               = ${maven2.repo}/org/apache/tika/tika-core/${tika-core.version}
-tika-core.sha512            = F2806CCE357C4A20AEC8BC4F5F5E4B70F8F4515B5D4CD1AE4C9DF84B47AEEE99505A8D0FF3077A95AB9A550A74934C97D654FEBDB5D38707F1EC3E0DC30EF120
+tika-core.sha512            = 9d3131d7e5fbab717f2590f4fe0df161189f29490f7d3238512e68924953a136497c37b39a9260b9c6350b335670db207fa8a45838f99d60c1e906872bda1eda
 
-tika-parsers.version        = 1.20
+tika-parsers.version        = 1.21
 tika-parsers.jar            = tika-parsers-${tika-parsers.version}.jar
 tika-parsers.loc            = ${maven2.repo}/org/apache/tika/tika-parsers/${tika-parsers.version}
-tika-parsers.sha512         = D4202D13A713073225BA52BF2EF2260AF3786C6E3D9C383F9822ED15CBFD89E3105D2BAC0B9E44526C70325DF64D976881E6209893C2305816EEA4C90AAC56AE
+tika-parsers.sha512         = 2728ca01817f9509912e738e65bd42f4a0296e206bfa3382c0b7eb5935a3d19c93142d4c0b589de0bd582cf41ab54a3c374d0d7c2a9d555ebe086c7e90278ed9
 
 # XStream can be found at: http://x-stream.github.io
 xstream.version             = 1.4.11
diff --git a/eclipse.classpath b/eclipse.classpath
@@ -104,8 +104,8 @@
 	<classpathentry kind="lib" path="lib/Saxon-HE-9.9.1-1.jar"/>
 	<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/tika-core-1.20.jar"/>
-	<classpathentry kind="lib" path="lib/tika-parsers-1.20.jar"/>
+	<classpathentry kind="lib" path="lib/tika-core-1.21.jar"/>
+	<classpathentry kind="lib" path="lib/tika-parsers-1.21.jar"/>
 	<classpathentry kind="lib" path="lib/xalan-2.7.2.jar"/>
 	<classpathentry kind="lib" path="lib/xercesImpl-2.12.0.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis-1.4.01.jar"/>
diff --git a/lib/aareadme.txt b/lib/aareadme.txt
@@ -249,7 +249,7 @@ http://www.slf4j.org/
 - json-path
 - jmeter internal logging
 
-tika-1.20
+tika-1.21
 --------------
 http://tika.apache.org/
 - Regular Expression Extractor
diff --git a/licenses/bin/README.txt b/licenses/bin/README.txt
@@ -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.20.jar
-tika-parsers-1.20.jar
+tika-core-1.21.jar
+tika-parsers-1.21.jar
 xalan-2.7.2.jar
 xercesImpl-2.12.0.jar
 xml-apis-1.4.01.jar
diff --git a/res/maven/ApacheJMeter_parent.pom b/res/maven/ApacheJMeter_parent.pom
@@ -113,8 +113,8 @@ under the License.
       <cglib-nodep.version>3.2.9</cglib-nodep.version>
       <objenesis.version>2.6</objenesis.version>
       <jtidy.version>r938</jtidy.version>
-      <tika-core.version>1.20</tika-core.version>
-      <tika-parsers.version>1.20</tika-parsers.version>
+      <tika-core.version>1.21</tika-core.version>
+      <tika-parsers.version>1.21</tika-parsers.version>
       <xmlpull.version>1.1.3.1</xmlpull.version>
       <xstream.version>1.4.11</xstream.version>
       <xpp3.version>1.1.4c</xpp3.version>
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
@@ -125,6 +125,7 @@ to view the last major behaviors with the version 5.1.1.
 
 <ch_section>Non-functional changes</ch_section>
 <ul>
+    <li>Updated to tika-core and tika-parsers 1.21 (from 1.21)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->
