You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2013/07/07 21:15:31 UTC

svn commit: r1500508 - in /jmeter/trunk: build.properties eclipse.classpath lib/ lib/aareadme.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml

Author: milamber
Date: Sun Jul  7 19:15:31 2013
New Revision: 1500508

URL: http://svn.apache.org/r1500508
Log:
Updated to tika 1.4 (from 1.3)

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=1500508&r1=1500507&r2=1500508&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Jul  7 19:15:31 2013
@@ -245,15 +245,15 @@ tidy.loc                    = ${maven2.r
 tidy.md5                    = 6A9121561B8F98C0A8FB9B6E57F50E6B
 
 # Apache Tika to extract text from various documents
-tika-core.version           = 1.3
+tika-core.version           = 1.4
 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               = c2ed96ffc57a00117b8873a1af7ad3b4
+tika-core.md5               = ae72caffb94fc6cdc19ddc35c16a82f8
 
-tika-parsers.version        = 1.3
+tika-parsers.version        = 1.4
 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            = 473ec7a22ef1c4bf00dd0ee4ff7f4526
+tika-parsers.md5            = 95c3b067d5b3e5a7ddcd1bea4030e263
 
 # XStream can be found at: http://xstream.codehaus.org/
 xstream.version             = 1.4.4

Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1500508&r1=1500507&r2=1500508&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Jul  7 19:15:31 2013
@@ -81,8 +81,8 @@
 	<classpathentry kind="lib" path="lib/serializer-2.7.1.jar"/>
     <classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
 	<classpathentry kind="lib" path="lib/soap-2.3.1.jar"/>
-    <classpathentry kind="lib" path="lib/tika-core-1.3.jar"/>
-    <classpathentry kind="lib" path="lib/tika-parsers-1.3.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/xalan-2.7.1.jar"/>
 	<classpathentry kind="lib" path="lib/xercesImpl-2.9.1.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>

Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul  7 19:15:31 2013
@@ -50,5 +50,5 @@ xmlgraphics-commons-1.5.jar
 xmlpull-1.1.3.1.jar
 xpp3_min-1.1.4c.jar
 xstream-1.4.4.jar
-tika-core-1.3.jar
-tika-parsers-1.3.jar
+tika-core-1.4.jar
+tika-parsers-1.4.jar

Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1500508&r1=1500507&r2=1500508&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Jul  7 19:15:31 2013
@@ -174,7 +174,7 @@ soap-2.3.1
 ----------
 - WebServiceSampler ONLY
 
-tika-1.3
+tika-1.4
 --------------
 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=1500508&r1=1500507&r2=1500508&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Jul  7 19:15:31 2013
@@ -88,8 +88,8 @@ under the License.
       <slf4j.version>1.7.5</slf4j.version>
       <soap.version>2.3.1</soap.version>
       <tidy.version>r938</tidy.version>
-      <tika-core.version>1.3</tika-core.version>
-      <tika-parsers.version>1.3</tika-parsers.version>
+      <tika-core.version>1.4</tika-core.version>
+      <tika-parsers.version>1.4</tika-parsers.version>
       <xmlpull.version>1.1.3.1</xmlpull.version>
       <xstream.version>1.4.4</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=1500508&r1=1500507&r2=1500508&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Jul  7 19:15:31 2013
@@ -232,7 +232,6 @@ Transaction Controller now sets Response
 <ul>
 <li>Updated to jsoup-1.7.2</li>
 <li><bugzilla>54776</bugzilla> - Update the dependency on Bouncy Castle to 1.48</li>
-<li>Updated to commons-logging 1.1.2 (from 1.1.1)</li>
 <li>Updated to HttpComponents Client 4.2.5 (from 4.2.3)</li>
 <li>Updated to HttpComponents Core 4.2.4 (from 4.2.3)</li>
 <li>Updated to commons-codec 1.8 (from 1.6)</li>
@@ -243,6 +242,7 @@ Transaction Controller now sets Response
 <li>Updated to jodd-lagarto and jodd-core 3.4.4 (from 3.4.1)</li>
 <li>Updated to junit 4.11 (from 4.10)</li>
 <li>Updated to slf4j-api 1.7.5 (from 1.7.2)</li>
+<li>Updated to tika 1.4 (from 1.3)</li>
 <li>Updated to xmlgraphics-commons 1.5 (from 1.3.1)</li>
 <li>Updated to xstream 1.4.4 (from 1.4.2)</li>
 <li><bugzilla>54912</bugzilla> - JMeterTreeListener should use constants</li>