Author: pmouawad Date: Sat Aug 26 17:40:17 2017 New Revision: 1806315 URL: http://svn.apache.org/viewvc?rev=1806315&view=rev Log: Upgrade caffeine from 2.5.3 to 2.5.5
Added: jmeter/trunk/licenses/bin/caffeine-2.5.5.txt - copied unchanged from r1806233, jmeter/trunk/licenses/bin/caffeine-2.5.3.txt Removed: jmeter/trunk/licenses/bin/caffeine-2.5.3.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=1806315&r1=1806314&r2=1806315&view=diff ============================================================================== --- jmeter/trunk/LICENSE [utf-8] (original) +++ jmeter/trunk/LICENSE [utf-8] Sat Aug 26 17:40:17 2017 @@ -245,7 +245,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.3.jar +* caffeine-2.5.5.jar * freemarker-2.3.23.jar (AL2.0, see licenses/bin for additional info) * json-path-2.4.0.jar * json-smart-2.3.jar Modified: jmeter/trunk/build.properties URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1806315&r1=1806314&r2=1806315&view=diff ============================================================================== --- jmeter/trunk/build.properties (original) +++ jmeter/trunk/build.properties Sat Aug 26 17:40:17 2017 @@ -85,10 +85,10 @@ dec.jar = dec-${dec.versi dec.loc = ${maven2.repo}/org/brotli/dec/${dec.version} dec.md5 = 4b1cd14cf29733941cc536b27e6aedfa -caffeine.version = 2.5.3 +caffeine.version = 2.5.5 caffeine.jar = caffeine-${caffeine.version}.jar caffeine.loc = ${maven2.repo}/com/github/ben-manes/caffeine/caffeine/${caffeine.version} -caffeine.md5 = 441c7d85c0fffc3c0bc86dd3f08e1cc7 +caffeine.md5 = b1888a45f63bb13019666fb5d08224ac 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=1806315&r1=1806314&r2=1806315&view=diff ============================================================================== --- jmeter/trunk/eclipse.classpath (original) +++ jmeter/trunk/eclipse.classpath Sat Aug 26 17:40:17 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.5.3.jar"/> + <classpathentry kind="lib" path="lib/caffeine-2.5.5.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 Sat Aug 26 17:40:17 2017 @@ -6,7 +6,7 @@ asm-5.2.jar bsf-2.4.0.jar bsh-2.0b5.jar bshclient.jar -caffeine-2.5.3.jar +caffeine-2.5.5.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=1806315&r1=1806314&r2=1806315&view=diff ============================================================================== --- jmeter/trunk/lib/aareadme.txt (original) +++ jmeter/trunk/lib/aareadme.txt Sat Aug 26 17:40:17 2017 @@ -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.3 +caffeine 2.5.5 ----------------- 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=1806315&r1=1806314&r2=1806315&view=diff ============================================================================== --- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original) +++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sat Aug 26 17:40:17 2017 @@ -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.3</caffeine.version> + <caffeine.version>2.5.5</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> Modified: jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1806315&r1=1806314&r2=1806315&view=diff ============================================================================== --- jmeter/trunk/xdocs/changes.xml [utf-8] (original) +++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Aug 26 17:40:17 2017 @@ -148,7 +148,7 @@ Incorporated feed back about unclear doc <ch_section>Non-functional changes</ch_section> <ul> <li>Updated to groovy 2.4.12 (from 2.4.10)</li> - <li>Updated to caffeine 2.5.3 (from 2.4.0)</li> + <li>Updated to caffeine 2.5.5 (from 2.4.0)</li> <li>Updated to commons-jexl3 3.1 (from 3.0)</li> <li>Updated to ph-css 5.0.4 (from 5.0.3)</li> <li>Updated to ph-commons 8.6.6 (from 8.6.0)</li>