Author: pmouawad
Date: Sun Jan 21 21:33:48 2018
New Revision: 1821813
URL: http://svn.apache.org/viewvc?rev=1821813&view=rev
Log:
Updated to caffeine 2.6.1 (from 2.5.5)
Added:
jmeter/trunk/licenses/bin/caffeine-2.6.1.txt
- copied unchanged from r1821735,
jmeter/trunk/licenses/bin/caffeine-2.5.5.txt
Removed:
jmeter/trunk/licenses/bin/caffeine-2.5.5.txt
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/README.md
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=1821813&r1=1821812&r2=1821813&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Jan 21 21:33:48 2018
@@ -247,7 +247,7 @@ The following software is provided under
- Software produced outside the ASF which is available under AL 2.0:
* accessors-smart-1.2.jar
-* caffeine-2.5.5.jar
+* caffeine-2.6.1.jar
* darcula.jar
* freemarker-2.3.23.jar (AL2.0, see licenses/bin for additional info)
* json-path-2.4.0.jar
Modified: jmeter/trunk/README.md
URL:
http://svn.apache.org/viewvc/jmeter/trunk/README.md?rev=1821813&r1=1821812&r2=1821813&view=diff
==============================================================================
--- jmeter/trunk/README.md (original)
+++ jmeter/trunk/README.md Sun Jan 21 21:33:48 2018
@@ -5,9 +5,9 @@
[](https://travis-ci.org/apache/jmeter/)
[](https://codecov.io/gh/apache/jmeter)
[](https://maven-badges.herokuapp.com/maven-central/org.apache.jmeter/ApacheJMeter)
-[](http://www.apache.org/licenses/LICENSE-2.0.html)
-[](http://stackoverflow.com/questions/tagged/jmeter)
-[](https://twitter.com/intent/tweet?text=Powerful%20load%20testing%20with%20Apache%20JMeter:&url=http://jmeter.apache.org)
+[](http://www.apache.org/licenses/LICENSE-2.0.html)
+[](https://stackoverflow.com/questions/tagged/jmeter)
+[](https://twitter.com/intent/tweet?text=Powerful%20load%20testing%20with%20Apache%20JMeter:&url=https://jmeter.apache.org)
## What is it?
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1821813&r1=1821812&r2=1821813&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Jan 21 21:33:48 2018
@@ -85,10 +85,10 @@ dec.jar = dec-${dec.
dec.loc = ${maven2.repo}/org/brotli/dec/${dec.version}
dec.md5 = 4b1cd14cf29733941cc536b27e6aedfa
-caffeine.version = 2.5.5
+caffeine.version = 2.6.1
caffeine.jar = caffeine-${caffeine.version}.jar
caffeine.loc =
${maven2.repo}/com/github/ben-manes/caffeine/caffeine/${caffeine.version}
-caffeine.md5 = b1888a45f63bb13019666fb5d08224ac
+caffeine.md5 = 3a2290ae3b2975a9ec6188f69620b1ee
commons-codec.version = 1.10
commons-codec.jar = commons-codec-${commons-codec.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1821813&r1=1821812&r2=1821813&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Jan 21 21:33:48 2018
@@ -49,7 +49,7 @@
<classpathentry kind="lib" path="lib/asm-5.2.jar"/>
<classpathentry kind="lib" path="lib/bsf-2.4.0.jar"/>
<classpathentry kind="lib" path="lib/bsh-2.0b6.jar"/>
- <classpathentry kind="lib" path="lib/caffeine-2.5.5.jar"/>
+ <classpathentry kind="lib" path="lib/caffeine-2.6.1.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.10.jar"/>
<classpathentry kind="lib" path="lib/commons-collections-3.2.2.jar"/>
<classpathentry kind="lib" path="lib/commons-dbcp2-2.2.0.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jan 21 21:33:48 2018
@@ -6,7 +6,7 @@ asm-5.2.jar
bsf-2.4.0.jar
bsh-2.0b6.jar
bshclient.jar
-caffeine-2.5.5.jar
+caffeine-2.6.1.jar
cglib-nodep-3.2.5.jar
commons-codec-1.10.jar
commons-collections-3.2.2.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1821813&r1=1821812&r2=1821813&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Jan 21 21:33:48 2018
@@ -35,7 +35,7 @@ dec-0.1.2 (org.brotli.dec)
https://github.com/google/brotli/tree/master/java/org/brotli
- Used by HTTP4 HC Impl for brotli decoding
-caffeine 2.5.5
+caffeine 2.6.1
-----------------
https://github.com/ben-manes/caffeine/
- Used by CssParser
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1821813&r1=1821812&r2=1821813&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Jan 21 21:33:48 2018
@@ -60,7 +60,7 @@ under the License.
<bcprov.version>1.49</bcprov.version>
<bcpkix.version>1.49</bcpkix.version>
<dec.version>0.1.2</dec.version>
- <caffeine.version>2.5.5</caffeine.version>
+ <caffeine.version>2.6.1</caffeine.version>
<commons-codec.version>1.10</commons-codec.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-dbcp2.version>2.2.0</commons-dbcp2.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1821813&r1=1821812&r2=1821813&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Jan 21 21:33:48 2018
@@ -280,6 +280,7 @@ Graphs <i>Latency Vs Request</i> and <i>
<li>Updated to rhino-1.7.7.2 (from rhino-1.7.7.1)</li>
<li>Updated to tika-core and tika-parsers 1.17 (from 1.16)</li>
<li>Updated to commons-dbcp2-2.2.0 (from 2.1.1)</li>
+ <li>Updated to caffeine 2.6.1 (from 2.5.5)</li>
<li><bug>61642</bug>Improve FTP test coverage</li>
<li><bug>61641</bug>Improve JMS test coverage</li>
<li><bug>61651</bug>Improve TCP test coverage</li>
