jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1618602 - in /jmeter/trunk: build.properties eclipse.classpath lib/ licenses/bin/xstream-1.4.6.txt licenses/bin/xstream-1.4.7.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Date Mon, 18 Aug 2014 13:35:33 GMT
Author: sebb
Date: Mon Aug 18 13:35:32 2014
New Revision: 1618602

URL: http://svn.apache.org/r1618602
Log:
Update XStream to 1.4.7

Added:
    jmeter/trunk/licenses/bin/xstream-1.4.7.txt
      - copied unchanged from r1618084, jmeter/trunk/licenses/bin/xstream-1.4.6.txt
Removed:
    jmeter/trunk/licenses/bin/xstream-1.4.6.txt
Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/eclipse.classpath
    jmeter/trunk/lib/   (props changed)
    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=1618602&r1=1618601&r2=1618602&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Mon Aug 18 13:35:32 2014
@@ -19,6 +19,7 @@
 #    When updating this file, please also update the versions in
 #    - res/maven/ApacheJMeter_parent.pom
 #    - eclipse.classpath
+#    - licenses/ - file name and contents
 #    - xdocs/changes.xml
 #
 #    Also, please update the lib/ directory ignore list
@@ -281,10 +282,10 @@ tika-parsers.loc            = ${maven2.r
 tika-parsers.md5            = f1056da5d1021ad1bbac7dab01b335d1
 
 # XStream can be found at: http://xstream.codehaus.org/
-xstream.version             = 1.4.6
+xstream.version             = 1.4.7
 xstream.jar                 = xstream-${xstream.version}.jar
 xstream.loc                 = ${maven2.repo}/com/thoughtworks/xstream/xstream/${xstream.version}
-xstream.md5                 = c35dfb87dd73ef6e2de7941f0a1d18e1
+xstream.md5                 = 9d5276eee85637842dcd2095f820e964
 
 # 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=1618602&r1=1618601&r2=1618602&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Mon Aug 18 13:35:32 2014
@@ -95,7 +95,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.6.jar"/>
+	<classpathentry kind="lib" path="lib/xstream-1.4.7.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"/>

Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 18 13:35:32 2014
@@ -46,12 +46,12 @@ serializer-2.7.1.jar
 slf4j-api-1.7.5.jar
 slf4j-nop-1.7.5.jar
 soap-2.3.1.jar
+tika-core-1.5.jar
+tika-parsers-1.5.jar
 xalan-2.7.1.jar
 xercesImpl-2.11.0.jar
 xml-apis-1.4.01.jar
 xmlgraphics-commons-1.5.jar
 xmlpull-1.1.3.1.jar
 xpp3_min-1.1.4c.jar
-xstream-1.4.6.jar
-tika-core-1.5.jar
-tika-parsers-1.5.jar
+xstream-1.4.7.jar

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1618602&r1=1618601&r2=1618602&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Mon Aug 18 13:35:32 2014
@@ -97,7 +97,7 @@ under the License.
       <tika-core.version>1.5</tika-core.version>
       <tika-parsers.version>1.5</tika-parsers.version>
       <xmlpull.version>1.1.3.1</xmlpull.version>
-      <xstream.version>1.4.6</xstream.version>
+      <xstream.version>1.4.7</xstream.version>
       <xpp3.version>1.1.4c</xpp3.version>
       <xalan.version>2.7.1</xalan.version>
       <serializer.version>2.7.1</serializer.version>

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1618602&r1=1618601&r2=1618602&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Mon Aug 18 13:35:32 2014
@@ -257,7 +257,7 @@ jmeter.gui.action.LookAndFeelCommand: Us
 <li>Updated to tika 1.5 (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.6 (from 1.4.4)</li>
+<li>Updated to xstream 1.4.7 (from 1.4.4)</li>
 <li>Updated to jodd 3.5.2 (from 3.4.10)</li>
 <li>Updated to rsyntaxtextarea 2.5.3 (from 2.5.1)</li>
 </ul>



Mime
View raw message