Author: fschumacher
Date: Sun Jul 15 10:17:40 2018
New Revision: 1835960

URL: http://svn.apache.org/viewvc?rev=1835960&view=rev
Log:
Updated to caffeine-2.6.2 (from caffeine-2.6.1)

Added:
    jmeter/trunk/licenses/bin/caffeine-2.6.2.txt
      - copied unchanged from r1835959, jmeter/trunk/licenses/bin/caffeine-2.6.1.txt
Removed:
    jmeter/trunk/licenses/bin/caffeine-2.6.1.txt
Modified:
    jmeter/trunk/LICENSE
    jmeter/trunk/build.properties
    jmeter/trunk/eclipse.classpath
    jmeter/trunk/lib/   (props changed)
    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=1835960&r1=1835959&r2=1835960&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Jul 15 10:17:40 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.6.1.jar
+* caffeine-2.6.2.jar
 * darcula.jar
 * freemarker-2.3.28.jar (AL2.0, see licenses/bin for additional info)
 * json-path-2.4.0.jar

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1835960&r1=1835959&r2=1835960&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Jul 15 10:17:40 2018
@@ -85,10 +85,10 @@ dec.jar                     = dec-${dec.
 dec.loc                     = ${maven2.repo}/org/brotli/dec/${dec.version}
 dec.md5                     = 4b1cd14cf29733941cc536b27e6aedfa
 
-caffeine.version            = 2.6.1
+caffeine.version            = 2.6.2
 caffeine.jar                = caffeine-${caffeine.version}.jar
 caffeine.loc                = ${maven2.repo}/com/github/ben-manes/caffeine/caffeine/${caffeine.version}
-caffeine.md5                = 3a2290ae3b2975a9ec6188f69620b1ee
+caffeine.md5                = 97a80024e99a27279faa17509850c606
 
 commons-codec.version       = 1.11
 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=1835960&r1=1835959&r2=1835960&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Jul 15 10:17:40 2018
@@ -49,7 +49,7 @@
 	<classpathentry kind="lib" path="lib/asm-6.1.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.6.1.jar"/>
+	<classpathentry kind="lib" path="lib/caffeine-2.6.2.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.11.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 Jul 15 10:17:40 2018
@@ -6,7 +6,7 @@ asm-6.1.jar
 bsf-2.4.0.jar
 bsh-2.0b6.jar
 bshclient.jar
-caffeine-2.6.1.jar
+caffeine-2.6.2.jar
 cglib-nodep-3.2.6.jar
 commons-codec-1.11.jar
 commons-collections-3.2.2.jar

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1835960&r1=1835959&r2=1835960&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Jul 15 10:17:40 2018
@@ -60,7 +60,7 @@ under the License.
       <bcprov.version>1.59</bcprov.version>
       <bcpkix.version>1.59</bcpkix.version>
       <dec.version>0.1.2</dec.version>
-      <caffeine.version>2.6.1</caffeine.version>
+      <caffeine.version>2.6.2</caffeine.version>
       <commons-codec.version>1.11</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=1835960&r1=1835959&r2=1835960&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Jul 15 10:17:40 2018
@@ -169,7 +169,8 @@ this behaviour, set <code>httpclient.res
     <li>Updated to tika-core and tika-parsers 1.18 (from 1.17)</li>
     <li><bug>62482</bug>Sync documentation to the implementation of the ForEachController. Based on contribution by orimarko (orimarko at gmail.com)</li>
     <li><bug>62529</bug>Updated to httpclient-4.5.6 (from httpclient 4.5.5) and updated to freemarker-2.3.28 (from freemarker-2.3.23). Based on patch by orimarko (orimarko at gmail.com)</li>
-    <li>Updated to httpmime-4.5.6 (from httpmime 4.5.5)</li>
+    <li>Updated to httpmime-4.5.6 (from httpmime-4.5.5)</li>
+    <li>Updated to caffeine-2.6.2 (from caffeine-2.6.1)</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->