jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1796691 - in /jmeter/trunk: LICENSE build.properties eclipse.classpath lib/ lib/aareadme.txt licenses/bin/xstream-1.4.10.txt licenses/bin/xstream-1.4.9.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Date Mon, 29 May 2017 20:29:06 GMT
Author: pmouawad
Date: Mon May 29 20:29:06 2017
New Revision: 1796691

URL: http://svn.apache.org/viewvc?rev=1796691&view=rev
Log:
Updated to xstream 1.4.10 (from 1.4.9)

Added:
    jmeter/trunk/licenses/bin/xstream-1.4.10.txt
      - copied unchanged from r1796494, jmeter/trunk/licenses/bin/xstream-1.4.9.txt
Removed:
    jmeter/trunk/licenses/bin/xstream-1.4.9.txt
Modified:
    jmeter/trunk/LICENSE
    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/LICENSE
URL: http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1796691&r1=1796690&r2=1796691&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Mon May 29 20:29:06 2017
@@ -276,5 +276,5 @@ For details, please see the files under:
 * slf4j-ext-1.7.25.jar (MIT)
 * xmlpull-1.1.3.1.jar (Public Domain)
 * xpp3-1.1.4c.jar (Indiana University Extreme! Lab Software License 1.1.1)
-* xstream-1.4.9.jar (BSD)
+* xstream-1.4.10.jar (BSD)
 * hamcrest-date-2.0.4.jar (BSD)

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1796691&r1=1796690&r2=1796691&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Mon May 29 20:29:06 2017
@@ -333,10 +333,10 @@ tika-parsers.loc            = ${maven2.r
 tika-parsers.md5            = d7e4fe3f91a3fead81a8d29253d7aa71
 
 # XStream can be found at: http://x-stream.github.io
-xstream.version             = 1.4.9
+xstream.version             = 1.4.10
 xstream.jar                 = xstream-${xstream.version}.jar
 xstream.loc                 = ${maven2.repo}/com/thoughtworks/xstream/xstream/${xstream.version}
-xstream.md5                 = 17f5ef61f6225a86ac39fc3dab45d755
+xstream.md5                 = d00eec778910f95b26201395ac64cca0
 
 # 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=1796691&r1=1796690&r2=1796691&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Mon May 29 20:29:06 2017
@@ -105,7 +105,7 @@
 	<classpathentry kind="lib" path="lib/xmlgraphics-commons-2.2.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.9.jar"/>
+	<classpathentry kind="lib" path="lib/xstream-1.4.10.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 May 29 20:29:06 2017
@@ -24,6 +24,7 @@ freemarker-2.3.23.jar
 hamcrest-core-1.3.jar
 geronimo*.jar
 groovy-all-2.4.11.jar
+hamcrest-date-2.0.4.jar
 httpasyncclient-4.1.3.jar
 httpclient-4.5.3.jar
 httpcore-4.4.6.jar
@@ -64,5 +65,4 @@ xml-apis-1.4.01.jar
 xmlgraphics-commons-2.2.jar
 xmlpull-1.1.3.1.jar
 xpp3_min-1.1.4c.jar
-xstream-1.4.9.jar
-hamcrest-date-2.0.4.jar
+xstream-1.4.10.jar

Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1796691&r1=1796690&r2=1796691&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Mon May 29 20:29:06 2017
@@ -273,7 +273,7 @@ or
 http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/
 - xstream
 
-xstream-1.4.9
+xstream-1.4.10
 -------------
 http://x-stream.github.io/download.html
 - SaveService

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1796691&r1=1796690&r2=1796691&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Mon May 29 20:29:06 2017
@@ -107,7 +107,7 @@ under the License.
       <tika-core.version>1.14</tika-core.version>
       <tika-parsers.version>1.14</tika-parsers.version>
       <xmlpull.version>1.1.3.1</xmlpull.version>
-      <xstream.version>1.4.9</xstream.version>
+      <xstream.version>1.4.10</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.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1796691&r1=1796690&r2=1796691&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Mon May 29 20:29:06 2017
@@ -135,6 +135,7 @@ Summary
     <li>Updated to log4j2 2.8.2 (from 2.8.1)</li>
     <li>Updated to xmlgraphics-commons 2.2 (from 2.1)</li>
     <li>Updated to jodd 3.8.6 (from 3.8.1)</li>
+    <li>Updated to xstream 1.4.10 (from 1.4.9)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->



Mime
View raw message