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 2017/03/02 22:05:21 UTC
svn commit: r1785205 - in /jmeter/trunk: LICENSE build.properties
eclipse.classpath lib/ lib/aareadme.txt licenses/bin/caffeine-2.3.5.txt
licenses/bin/caffeine-2.4.0.txt res/maven/ApacheJMeter_parent.pom
Author: pmouawad
Date: Thu Mar 2 22:05:21 2017
New Revision: 1785205
URL: http://svn.apache.org/viewvc?rev=1785205&view=rev
Log:
Update caffeine to 2.4.0 from 2.3.5
Added:
jmeter/trunk/licenses/bin/caffeine-2.4.0.txt
- copied unchanged from r1784826, jmeter/trunk/licenses/bin/caffeine-2.3.5.txt
Removed:
jmeter/trunk/licenses/bin/caffeine-2.3.5.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
Modified: jmeter/trunk/LICENSE
URL: http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1785205&r1=1785204&r2=1785205&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Thu Mar 2 22:05:21 2017
@@ -244,7 +244,7 @@ The following software is provided under
- Software produced outside the ASF which is available under AL 2.0:
* accessors-smart-1.1.jar
-* caffeine-2.3.5.jar
+* caffeine-2.4.0.jar
* freemarker-2.3.23.jar (AL2.0, see licenses/bin for additional info)
* json-path-2.2.0.jar
* json-smart-2.2.1.jar
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1785205&r1=1785204&r2=1785205&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Thu Mar 2 22:05:21 2017
@@ -80,10 +80,10 @@ bcpkix.jar = bcpkix-jdk
bcpkix.loc = ${maven2.repo}/org/bouncycastle/bcpkix-jdk15on/${bcprov.version}
bcpkix.md5 = cb025ef84fb991e14fdf62f6bef7be53
-caffeine.version = 2.3.5
+caffeine.version = 2.4.0
caffeine.jar = caffeine-${caffeine.version}.jar
caffeine.loc = ${maven2.repo}/com/github/ben-manes/caffeine/caffeine/${caffeine.version}
-caffeine.md5 = 5ff5404cc94337fd6976a06ed6f1f023
+caffeine.md5 = 88d83922414143f7c3c1d12b83ca4d7b
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=1785205&r1=1785204&r2=1785205&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Thu Mar 2 22:05:21 2017
@@ -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.0b5.jar"/>
- <classpathentry kind="lib" path="lib/caffeine-2.3.5.jar"/>
+ <classpathentry kind="lib" path="lib/caffeine-2.4.0.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.1.1.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 2 22:05:21 2017
@@ -6,7 +6,7 @@ asm-5.2.jar
bsf-2.4.0.jar
bsh-2.0b5.jar
bshclient.jar
-caffeine-2.3.5.jar
+caffeine-2.4.0.jar
commons-codec-1.10.jar
commons-collections-3.2.2.jar
commons-dbcp2-2.1.1.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1785205&r1=1785204&r2=1785205&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Thu Mar 2 22:05:21 2017
@@ -30,6 +30,12 @@ bsh-2.0b5.jar (org.bsh)
-------------
- BeanShell test elements
+caffeine 2.4.0
+-----------------
+https://github.com/ben-manes/caffeine/
+- Used by CssParser
+- Used by JMS Publisher Sampler
+
commons-codec-1.10
-----------------
http://commons.apache.org/downloads/download_codec.cgi
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1785205&r1=1785204&r2=1785205&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Thu Mar 2 22:05:21 2017
@@ -59,7 +59,7 @@ under the License.
<bcmail.version>1.49</bcmail.version>
<bcprov.version>1.49</bcprov.version>
<bcpkix.version>1.49</bcpkix.version>
- <caffeine.version>2.3.5</caffeine.version>
+ <caffeine.version>2.4.0</caffeine.version>
<commons-codec.version>1.10</commons-codec.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-dbcp2.version>2.1.1</commons-dbcp2.version>