You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2015/02/19 22:41:43 UTC

svn commit: r1661011 - in /jmeter/trunk: build.properties eclipse.classpath licenses/bin/xstream-1.4.7.txt licenses/bin/xstream-1.4.8.txt res/maven/ApacheJMeter_parent.pom xdocs/changes_history.xml

Author: pmouawad
Date: Thu Feb 19 21:41:42 2015
New Revision: 1661011

URL: http://svn.apache.org/r1661011
Log:
Upgrade to xstream-1.4.8

Added:
    jmeter/trunk/licenses/bin/xstream-1.4.8.txt   (contents, props changed)
      - copied, changed from r1656228, jmeter/trunk/licenses/bin/xstream-1.4.7.txt
Removed:
    jmeter/trunk/licenses/bin/xstream-1.4.7.txt
Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/eclipse.classpath
    jmeter/trunk/res/maven/ApacheJMeter_parent.pom
    jmeter/trunk/xdocs/changes_history.xml

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1661011&r1=1661010&r2=1661011&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Thu Feb 19 21:41:42 2015
@@ -292,10 +292,10 @@ tika-parsers.loc            = ${maven2.r
 tika-parsers.md5            = ef667e5c188e5a29464bd24a7fcb3df8
 
 # XStream can be found at: http://xstream.codehaus.org/
-xstream.version             = 1.4.7
+xstream.version             = 1.4.8
 xstream.jar                 = xstream-${xstream.version}.jar
 xstream.loc                 = ${maven2.repo}/com/thoughtworks/xstream/xstream/${xstream.version}
-xstream.md5                 = 9d5276eee85637842dcd2095f820e964
+xstream.md5                 = 4551a29c38f22ed25eaf109eda50ff03
 
 # XMLPull is required by XStream 1.4.x
 xmlpull.version             = 1.1.3.1

Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1661011&r1=1661010&r2=1661011&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Thu Feb 19 21:41:42 2015
@@ -96,7 +96,7 @@
 	<classpathentry kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
 	<classpathentry kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
-	<classpathentry kind="lib" path="lib/xstream-1.4.7.jar"/>
+	<classpathentry kind="lib" path="lib/xstream-1.4.8.jar"/>
 	<!-- Needed for build and test -->
 	<classpathentry kind="lib" path="lib/api/bcmail-jdk15on-1.49.jar"/>
 	<classpathentry kind="lib" path="lib/api/bcprov-jdk15on-1.49.jar"/>

Copied: jmeter/trunk/licenses/bin/xstream-1.4.8.txt (from r1656228, jmeter/trunk/licenses/bin/xstream-1.4.7.txt)
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/xstream-1.4.8.txt?p2=jmeter/trunk/licenses/bin/xstream-1.4.8.txt&p1=jmeter/trunk/licenses/bin/xstream-1.4.7.txt&r1=1656228&r2=1661011&rev=1661011&view=diff
==============================================================================
    (empty)

Propchange: jmeter/trunk/licenses/bin/xstream-1.4.8.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1661011&r1=1661010&r2=1661011&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Thu Feb 19 21:41:42 2015
@@ -99,7 +99,7 @@ under the License.
       <tika-core.version>1.7</tika-core.version>
       <tika-parsers.version>1.7</tika-parsers.version>
       <xmlpull.version>1.1.3.1</xmlpull.version>
-      <xstream.version>1.4.7</xstream.version>
+      <xstream.version>1.4.8</xstream.version>
       <xpp3.version>1.1.4c</xpp3.version>
       <xalan.version>2.7.2</xalan.version>
       <serializer.version>2.7.2</serializer.version>

Modified: jmeter/trunk/xdocs/changes_history.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes_history.xml?rev=1661011&r1=1661010&r2=1661011&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes_history.xml (original)
+++ jmeter/trunk/xdocs/changes_history.xml Thu Feb 19 21:41:42 2015
@@ -389,7 +389,7 @@ for details on configuring this componen
 <li>Updated to tika 1.6 (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.7 (from 1.4.4)</li>
+<li>Updated to xstream 1.4.8 (from 1.4.4)</li>
 <li>Updated to jodd 3.6.1 (from 3.4.10)</li>
 <li>Updated to rsyntaxtextarea 2.5.3 (from 2.5.1)</li>
 <li>Updated xalan and serializer to 2.7.2 (from 2.7.1)</li>