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/04/30 20:47:57 UTC
svn commit: r1793277 - in /jmeter/trunk: build.properties build.xml
eclipse.classpath
Author: pmouawad
Date: Sun Apr 30 20:47:57 2017
New Revision: 1793277
URL: http://svn.apache.org/viewvc?rev=1793277&view=rev
Log:
Bug 61056 - HTTP : Support brotli decoding
Fix tests failure
Bugzilla Id: 61056
Modified:
jmeter/trunk/build.properties
jmeter/trunk/build.xml
jmeter/trunk/eclipse.classpath
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1793277&r1=1793276&r2=1793277&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Apr 30 20:47:57 2017
@@ -80,10 +80,10 @@ bcpkix.jar = bcpkix-jdk
bcpkix.loc = ${maven2.repo}/org/bouncycastle/bcpkix-jdk15on/${bcprov.version}
bcpkix.md5 = cb025ef84fb991e14fdf62f6bef7be53
-brotli-dec.version = 0.1.1
-brotli-dec.jar = dec-${brotli-dec.version}.jar
-brotli-dec.loc = ${maven2.repo}/org/brotli/dec/${brotli-dec.version}
-brotli-dec.md5 = 8bb5a4369b73e923bb51fbf099a40f60
+dec.version = 0.1.1
+dec.jar = dec-${dec.version}.jar
+dec.loc = ${maven2.repo}/org/brotli/dec/${dec.version}
+dec.md5 = 8bb5a4369b73e923bb51fbf099a40f60
caffeine.version = 2.4.0
caffeine.jar = caffeine-${caffeine.version}.jar
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1793277&r1=1793276&r2=1793277&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Apr 30 20:47:57 2017
@@ -385,7 +385,7 @@
<include name="${lib.dir}/${apache-bsf.jar}"/>
<include name="${lib.dir}/${asm.jar}"/>
<include name="${lib.dir}/${beanshell.jar}"/>
- <include name="${lib.dir}/${brotli-dec.jar}"/>
+ <include name="${lib.dir}/${dec.jar}"/>
<include name="${lib.dir}/${caffeine.jar}"/>
<include name="${lib.dir}/${commons-codec.jar}"/>
<include name="${lib.dir}/${commons-collections.jar}"/>
@@ -466,7 +466,7 @@
<pathelement location="${lib.dir}/${apache-bsf.jar}"/>
<pathelement location="${lib.dir}/${asm.jar}"/>
<pathelement location="${lib.dir}/${beanshell.jar}"/>
- <pathelement location="${lib.dir}/${brotli-dec.jar}"/>
+ <pathelement location="${lib.dir}/${dec.jar}"/>
<pathelement location="${lib.dir}/${caffeine.jar}"/>
<pathelement location="${lib.dir}/${commons-codec.jar}"/>
<pathelement location="${lib.dir}/${commons-collections.jar}"/>
@@ -3110,7 +3110,7 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="bcprov" dest.dir="${lib.api}"/>
<process_jarfile jarname="bcpkix" dest.dir="${lib.api}"/>
<process_jarfile jarname="beanshell"/>
- <process_jarfile jarname="brotli-dec"/>
+ <process_jarfile jarname="dec"/>
<process_jarfile jarname="caffeine"/>
<process_jarfile jarname="commons-codec"/>
<process_jarfile jarname="commons-collections"/>
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1793277&r1=1793276&r2=1793277&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Apr 30 20:47:57 2017
@@ -60,6 +60,7 @@
<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
<classpathentry kind="lib" path="lib/commons-net-3.6.jar"/>
<classpathentry kind="lib" path="lib/commons-pool2-2.4.2.jar"/>
+ <classpathentry kind="lib" path="lib/dec-0.1.1.jar"/>
<classpathentry kind="lib" path="lib/dnsjava-2.1.8.jar"/>
<classpathentry kind="lib" path="lib/freemarker-2.3.23.jar"/>
<classpathentry kind="lib" path="lib/groovy-all-2.4.11.jar"/>