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 2018/12/23 20:24:24 UTC

svn commit: r1849661 - in /jmeter/trunk: LICENSE build.properties eclipse.classpath lib/ lib/aareadme.txt licenses/bin/xstream-1.4.10.txt licenses/bin/xstream-1.4.11.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml

Author: pmouawad
Date: Sun Dec 23 20:24:24 2018
New Revision: 1849661

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

Added:
    jmeter/trunk/licenses/bin/xstream-1.4.11.txt
      - copied unchanged from r1846685, jmeter/trunk/licenses/bin/xstream-1.4.10.txt
Removed:
    jmeter/trunk/licenses/bin/xstream-1.4.10.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=1849661&r1=1849660&r2=1849661&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Dec 23 20:24:24 2018
@@ -283,6 +283,6 @@ 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.10.jar (BSD)
+* xstream-1.4.11.jar (BSD)
 * hamcrest-date-2.0.4.jar (BSD)
 * Saxon-HE-9.8.0-14.jar (Mozilla Public License version 2.0)

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1849661&r1=1849660&r2=1849661&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Dec 23 20:24:24 2018
@@ -367,10 +367,10 @@ tika-parsers.loc            = ${maven2.r
 tika-parsers.sha512         = D4202D13A713073225BA52BF2EF2260AF3786C6E3D9C383F9822ED15CBFD89E3105D2BAC0B9E44526C70325DF64D976881E6209893C2305816EEA4C90AAC56AE
 
 # XStream can be found at: http://x-stream.github.io
-xstream.version             = 1.4.10
+xstream.version             = 1.4.11
 xstream.jar                 = xstream-${xstream.version}.jar
 xstream.loc                 = ${maven2.repo}/com/thoughtworks/xstream/xstream/${xstream.version}
-xstream.sha512              = 19271DFF2CEA8D5DF6725B6938F4533BF4258B857C9BCFEE0891589D20D21FC49433694BEA2E0E647E722C8392EF714D4368B604D6D97B4649155B67C7C7988F
+xstream.sha512              = ACEBA38FE0239A8D873D276023F9EFD1C79CE8C6651BB7314A06684758AABFCDB1E89A71B26FA596C9491BDC3D4BBEEF3819683D65002E584CD4728A03C2DE0B
 
 # 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=1849661&r1=1849660&r2=1849661&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Dec 23 20:24:24 2018
@@ -110,7 +110,7 @@
 	<classpathentry kind="lib" path="lib/xmlgraphics-commons-2.3.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.10.jar"/>
+	<classpathentry kind="lib" path="lib/xstream-1.4.11.jar"/>
 	<!-- Needed for build and test -->
 	<classpathentry kind="lib" path="lib/spock-core-1.0-groovy-2.4.jar"/>
 	<classpathentry kind="lib" path="lib/cglib-nodep-3.2.9.jar"/>

Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 23 20:24:24 2018
@@ -73,4 +73,4 @@ xml-apis-1.4.01.jar
 xmlgraphics-commons-2.3.jar
 xmlpull-1.1.3.1.jar
 xpp3_min-1.1.4c.jar
-xstream-1.4.10.jar
+xstream-1.4.11.jar

Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1849661&r1=1849660&r2=1849661&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Dec 23 20:24:24 2018
@@ -296,7 +296,7 @@ or
 http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/
 - xstream
 
-xstream-1.4.10
+xstream-1.4.11
 -------------
 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=1849661&r1=1849660&r2=1849661&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Dec 23 20:24:24 2018
@@ -114,7 +114,7 @@ under the License.
       <tika-core.version>1.20</tika-core.version>
       <tika-parsers.version>1.20</tika-parsers.version>
       <xmlpull.version>1.1.3.1</xmlpull.version>
-      <xstream.version>1.4.10</xstream.version>
+      <xstream.version>1.4.11</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=1849661&r1=1849660&r2=1849661&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Dec 23 20:24:24 2018
@@ -143,6 +143,7 @@ of previous time slot as a base. Startin
     <li>Updated to log4j-2.11.1 (from log4j-2.11.0)</li>
     <li>Updated to xmlgraphics-commons 2.3 (from 2.2)</li>
     <li>Updated to Saxon-HE 9.8.0-14 (from 9.8.0-12)</li>
+    <li>Updated to xstream 1.4.11 (from 1.4.10)</li>
     <li><bug>62818</bug>Updated to xercesImpl to 2.12.0 (from 2.11.0). Reported by Stefan Seide (stefan at trilobyte-se.de)</li>
     <li><bug>62821</bug><pr>405</pr>Use SHA-512 checksums instead of MD5 to verify jar downloads</li>
     <li><pr>408</pr>Log an informational message instead of an stack trace, when JavaFX is not found for the <code>RenderInBrowser</code> component.</li>