jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject svn commit: r1562373 - in /jmeter/trunk: build.properties eclipse.classpath lib/ lib/aareadme.txt licenses/bin/xstream-1.4.4.txt licenses/bin/xstream-1.4.6.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Date Wed, 29 Jan 2014 07:35:37 GMT
Author: milamber
Date: Wed Jan 29 07:35:37 2014
New Revision: 1562373

URL: http://svn.apache.org/r1562373
Log:
Conversion error com.thoughtworks.xstream.converters.ConversionException with Java 8 Early
Access Build
Updated to xstream 1.4.6 (from 1.4.4)
Bugzilla Id: 56080

Added:
    jmeter/trunk/licenses/bin/xstream-1.4.6.txt   (contents, props changed)
      - copied, changed from r1562371, jmeter/trunk/licenses/bin/xstream-1.4.4.txt
Removed:
    jmeter/trunk/licenses/bin/xstream-1.4.4.txt
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=1562373&r1=1562372&r2=1562373&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Wed Jan 29 07:35:37 2014
@@ -271,10 +271,10 @@ tika-parsers.loc            = ${maven2.r
 tika-parsers.md5            = 95c3b067d5b3e5a7ddcd1bea4030e263
 
 # XStream can be found at: http://xstream.codehaus.org/
-xstream.version             = 1.4.4
+xstream.version             = 1.4.6
 xstream.jar                 = xstream-${xstream.version}.jar
 xstream.loc                 = ${maven2.repo}/com/thoughtworks/xstream/xstream/${xstream.version}
-xstream.md5                 = 4b2a6d156777975a7d15fe53a1c37fe7
+xstream.md5                 = c35dfb87dd73ef6e2de7941f0a1d18e1
 
 # 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=1562373&r1=1562372&r2=1562373&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Wed Jan 29 07:35:37 2014
@@ -93,7 +93,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.4.jar"/>
+	<classpathentry kind="lib" path="lib/xstream-1.4.6.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 Wed Jan 29 07:35:37 2014
@@ -50,6 +50,6 @@ 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.4.jar
+xstream-1.4.6.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=1562373&r1=1562372&r2=1562373&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Wed Jan 29 07:35:37 2014
@@ -227,7 +227,7 @@ or
 http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/
 - xstream
 
-xstream-1.4.4
+xstream-1.4.6
 -------------
 http://xstream.codehaus.org/download.html
 - SaveService
\ No newline at end of file

Copied: jmeter/trunk/licenses/bin/xstream-1.4.6.txt (from r1562371, jmeter/trunk/licenses/bin/xstream-1.4.4.txt)
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/xstream-1.4.6.txt?p2=jmeter/trunk/licenses/bin/xstream-1.4.6.txt&p1=jmeter/trunk/licenses/bin/xstream-1.4.4.txt&r1=1562371&r2=1562373&rev=1562373&view=diff
==============================================================================
    (empty)

Propchange: jmeter/trunk/licenses/bin/xstream-1.4.6.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=1562373&r1=1562372&r2=1562373&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Wed Jan 29 07:35:37 2014
@@ -95,7 +95,7 @@ under the License.
       <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>
+      <xstream.version>1.4.6</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=1562373&r1=1562372&r2=1562373&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Wed Jan 29 07:35:37 2014
@@ -153,6 +153,7 @@ A workaround is to use a Java 7 update 4
 <h3>General</h3>
 <ul>
 <li><bugzilla>56059</bugzilla> - Older TestBeans incompatible with 2.11
when using TextAreaEditor</li>
+<li><bugzilla>56080</bugzilla> - Conversion error com.thoughtworks.xstream.converters.ConversionException
with Java 8 Early Access Build</li>
 </ul>
 
 <!-- =================== Improvements =================== -->
@@ -201,6 +202,7 @@ A workaround is to use a Java 7 update 4
 <li>Updated to commons-codec 1.9 (from 1.8)</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>
 </ul>
 
 <ch_section>Thanks</ch_section>



Mime
View raw message