jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1328957 - in /jmeter/trunk: build.properties build.xml res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Date Sun, 22 Apr 2012 19:57:34 GMT
Author: pmouawad
Date: Sun Apr 22 19:57:34 2012
New Revision: 1328957

URL: http://svn.apache.org/viewvc?rev=1328957&view=rev
Log:
Bug 53129 - Upgrade XStream from 1.3.1 to 1.4.2

Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/build.xml
    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=1328957&r1=1328956&r2=1328957&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Apr 22 19:57:34 2012
@@ -199,10 +199,16 @@ tidy.loc                    = ${maven2.r
 tidy.md5                    = 6A9121561B8F98C0A8FB9B6E57F50E6B
 
 # XStream can be found at: http://xstream.codehaus.org/
-xstream.version             = 1.3.1
+xstream.version             = 1.4.2
 xstream.jar                 = xstream-${xstream.version}.jar
 xstream.loc                 = ${maven2.repo}/com/thoughtworks/xstream/xstream/${xstream.version}
-xstream.md5                 = 4DFEBEC402E7606B2C1F66DEC1773E8F
+xstream.md5                 = 23947B036DD0D9CD23CB2F388C373181
+
+# XMLPull is required by XStream 1.4.x
+xmlpull.version             = 1.1.3.1
+xmlpull.jar                 = xmlpull-${xmlpull.version}.jar
+xmlpull.loc                 = ${maven2.repo}/xmlpull/xmlpull/${xmlpull.version}
+xmlpull.md5                 = cc57dacc720eca721a50e78934b822d2
 
 xpp3.version                = 1.1.4c
 xpp3.jar                    = xpp3_min-${xpp3.version}.jar

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1328957&r1=1328956&r2=1328957&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Apr 22 19:57:34 2012
@@ -382,6 +382,7 @@
     <include name="${lib.dir}/${xml-apis.jar}"/>
     <include name="${lib.dir}/${xpp3.jar}"/>
     <include name="${lib.dir}/${xstream.jar}"/>
+  	<include name="${lib.dir}/${xmlpull.jar}"/>
   </patternset>
 
   <!--
@@ -443,6 +444,7 @@
     <pathelement location="${lib.dir}/${xml-apis.jar}"/>
     <pathelement location="${lib.dir}/${xpp3.jar}"/>
     <pathelement location="${lib.dir}/${xstream.jar}"/>
+  	<pathelement location="${lib.dir}/${xmlpull.jar}"/>
     <!-- Generated jars -->
     <fileset dir="${lib.dir}" includes="jorphan.jar"/>
     <!-- API-only jars-->
@@ -2438,6 +2440,7 @@ run JMeter unless all the JMeter jars ar
         <process_jarfile jarname="soap"/>
         <process_jarfile jarname="tidy"/>
         <process_jarfile jarname="xstream"/>
+    	<process_jarfile jarname="xmlpull"/>
     	<process_jarfile jarname="xpp3"/>
         <process_jarfile jarname="serializer"/>
         <process_jarfile jarname="xalan"/>

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1328957&r1=1328956&r2=1328957&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Apr 22 19:57:34 2012
@@ -82,7 +82,8 @@ under the License.
       <logkit.version>2.0</logkit.version>
       <soap.version>2.3.1</soap.version>
       <tidy.version>r938</tidy.version>
-      <xstream.version>1.3.1</xstream.version>
+      <xmlpull.version>1.1.3.1</xmlpull.version>
+      <xstream.version>1.4.2</xstream.version>
       <xpp3.version>1.1.4c</xpp3.version>
       <xalan.version>2.7.1</xalan.version>
       <serializer.version>2.7.1</serializer.version>
@@ -269,6 +270,11 @@ under the License.
         <version>${xstream.version}</version>
       </dependency>
       <dependency>
+        <groupId>xmlpull</groupId>
+        <artifactId>xmlpull</artifactId>
+        <version>${xmlpull.version}</version>
+      </dependency>
+      <dependency>
         <groupId>xpp3</groupId>
         <artifactId>xpp3_min</artifactId>
         <version>${xpp3.version}</version>

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1328957&r1=1328956&r2=1328957&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Apr 22 19:57:34 2012
@@ -213,6 +213,7 @@ with other code that depends on an earli
 <li>Bug 52788 - HttpRequestHdr : Optimize code to avoid useless work</li>
 <li>JMeter Ant (ant-jmeter-1.1.1.jar) task was upgraded from 1.0.9 to 1.1.1</li>
 <li>Updated to commons-io 2.2 (from 2.1)</li>
+<li>Bug 53129 - Upgrade XStream from 1.3.1 to 1.4.2</li>
 </ul>
 
 </section> 



Mime
View raw message