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/01/28 13:15:34 UTC

svn commit: r1780681 - in /jmeter/trunk: LICENSE build.properties eclipse.classpath lib/ lib/aareadme.txt licenses/bin/README.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml

Author: pmouawad
Date: Sat Jan 28 13:15:34 2017
New Revision: 1780681

URL: http://svn.apache.org/viewvc?rev=1780681&view=rev
Log:
Updated to httpclient 4.5.3 (from 4.5.2)

Modified:
    jmeter/trunk/LICENSE
    jmeter/trunk/build.properties
    jmeter/trunk/eclipse.classpath
    jmeter/trunk/lib/   (props changed)
    jmeter/trunk/lib/aareadme.txt
    jmeter/trunk/licenses/bin/README.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=1780681&r1=1780680&r2=1780681&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sat Jan 28 13:15:34 2017
@@ -226,9 +226,10 @@ The following software is provided under
 * excalibur-logger-1.1.jar
 * groovy-all-2.4.8.jar
 * httpasyncclient-4.1.2.jar
-* httpclient-4.5.2.jar
+* httpclient-4.5.3.jar
 * httpcore-4.4.6.jar
 * httpcore-nio-4.4.6.jar
+* httpmime-4.5.3.jar
 * jakarta-oro-2.0.8.jar
 * jms-1.1.1.jar
 * logkit-2.0.jar

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1780681&r1=1780680&r2=1780681&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sat Jan 28 13:15:34 2017
@@ -181,24 +181,23 @@ hamcrest-core.loc            = ${maven2.
 hamcrest-core.jar            = hamcrest-core-${hamcrest-core.version}.jar
 hamcrest-core.md5            = 6393363b47ddcbba82321110c3e07519
 
-# Apache HttpClient 4.x
-httpclient.version          = 4.5.2
-#
-httpclient.jar              = httpclient-${httpclient.version}.jar
-httpclient.loc              = ${maven2.repo}/org/apache/httpcomponents/httpclient/${httpclient.version}
-httpclient.md5              = e0a45df625cb96b69505e59bb25a0189
-
 # Apache HttpASyncClient 4.x
 httpasyncclient.version          = 4.1.2
-#
 httpasyncclient.jar              = httpasyncclient-${httpasyncclient.version}.jar
 httpasyncclient.loc              = ${maven2.repo}/org/apache/httpcomponents/httpasyncclient/${httpasyncclient.version}
 httpasyncclient.md5              = 262ed539a7d65addfe71b40345671a00
 
+# Apache HttpClient 4.x
+httpclient.version          = 4.5.3
+#
+httpclient.jar              = httpclient-${httpclient.version}.jar
+httpclient.loc              = ${maven2.repo}/org/apache/httpcomponents/httpclient/${httpclient.version}
+httpclient.md5              = 1965ebb7aca0f9f8faaed3870d8cf689
+
 # Required for HttpClient
 httpmime.jar                = httpmime-${httpclient.version}.jar
 httpmime.loc                = ${maven2.repo}/org/apache/httpcomponents/httpmime/${httpclient.version}
-httpmime.md5                = 336fa980f7527be719fa997f5df8046f
+httpmime.md5                = a00b6287cab2ad554ae3cbdbe983dc88
 
 # Required for HttpClient
 httpcore.version            = 4.4.6
@@ -206,7 +205,7 @@ httpcore.jar                = httpcore-$
 httpcore.loc                = ${maven2.repo}/org/apache/httpcomponents/httpcore/${httpcore.version}
 httpcore.md5                = a9fbd503e0802507efeeaffb56bbdf52
 
-# Required for HttpASyncClient
+# Required for HttpASyncClient 
 httpcore-nio.version            = 4.4.6
 httpcore-nio.jar                = httpcore-nio-${httpcore-nio.version}.jar
 httpcore-nio.loc                = ${maven2.repo}/org/apache/httpcomponents/httpcore-nio/${httpcore-nio.version}

Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1780681&r1=1780680&r2=1780681&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sat Jan 28 13:15:34 2017
@@ -71,10 +71,10 @@
     <classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
     <classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
     <classpathentry kind="lib" path="lib/httpasyncclient-4.1.2.jar"/>
-    <classpathentry kind="lib" path="lib/httpclient-4.5.2.jar"/>
+    <classpathentry kind="lib" path="lib/httpclient-4.5.3.jar"/>
     <classpathentry kind="lib" path="lib/httpcore-nio-4.4.6.jar"/>
     <classpathentry kind="lib" path="lib/httpcore-4.4.6.jar"/>
-    <classpathentry kind="lib" path="lib/httpmime-4.5.2.jar"/>
+    <classpathentry kind="lib" path="lib/httpmime-4.5.3.jar"/>
     <classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
     <classpathentry kind="lib" path="lib/jodd-core-3.8.1.jar"/>
     <classpathentry kind="lib" path="lib/jodd-lagarto-3.8.1.jar"/>

Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 28 13:15:34 2017
@@ -27,10 +27,10 @@ hamcrest-core-1.3.jar
 geronimo*.jar
 groovy-all-2.4.8.jar
 httpasyncclient-4.1.2.jar
-httpclient-4.5.2.jar
+httpclient-4.5.3.jar
 httpcore-4.4.6.jar
 httpcore-nio-4.4.6.jar
-httpmime-4.5.2.jar
+httpmime-4.5.3.jar
 jcharts-0.7.5.jar
 jms*.jar
 jodd-core-3.8.1.jar

Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1780681&r1=1780680&r2=1780681&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sat Jan 28 13:15:34 2017
@@ -193,7 +193,7 @@ junit 4.12
 
 HttpComponents
 - HttpComponents Core 4.4.6 
-- HttpComponents Client 4.5.2
+- HttpComponents Client 4.5.3
 - HttpComponents AsyncClient 4.1.2
 - HttpComponents Core NIO 4.4.6
 -----------

Modified: jmeter/trunk/licenses/bin/README.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/README.txt?rev=1780681&r1=1780680&r2=1780681&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/README.txt (original)
+++ jmeter/trunk/licenses/bin/README.txt Sat Jan 28 13:15:34 2017
@@ -20,9 +20,9 @@ commons-pool2-2.4.2.jar
 excalibur-logger-1.1.jar
 geronimo-jms_1.1_spec-1.1.1.jar
 groovy-all-2.4.8.jar
-httpclient-4.5.2.jar
+httpclient-4.5.3.jar
 httpcore-4.4.6.jar
-httpmime-4.5.2.jar
+httpmime-4.5.3.jar
 jorphan.jar (part of JMeter)
 logkit-2.0.jar
 oro-2.0.8.jar

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1780681&r1=1780680&r2=1780681&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sat Jan 28 13:15:34 2017
@@ -79,7 +79,7 @@ under the License.
       <groovy-all.version>2.4.8</groovy-all.version>
       <hamcrest-core.version>1.3</hamcrest-core.version>
       <httpasyncclient.version>4.1.2</httpasyncclient.version>
-      <httpclient.version>4.5.2</httpclient.version>
+      <httpclient.version>4.5.3</httpclient.version>
       <httpcore.version>4.4.6</httpcore.version>
       <httpcore-nio.version>4.4.6</httpcore-nio.version>
       <jakarta-oro.version>2.0.8</jakarta-oro.version>

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1780681&r1=1780680&r2=1780681&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Jan 28 13:15:34 2017
@@ -171,6 +171,7 @@ JMeter now requires Java 8. Ensure you u
     <li>Updated to dnsjava-2.1.8.jar (from 2.1.7)</li>
     <li>Updated to groovy 2.4.8 (from 2.4.7)</li>
     <li>Updated to httpcore 4.4.6 (from 4.4.5)</li>
+    <li>Updated to httpclient 4.5.3 (from 4.5.2)</li>
     <li>Updated to jodd 3.8.1 (from 3.8.1.jar)</li>
     <li>Updated to jsoup-1.10.2 (from 1.10.1)</li>
     <li>Updated to ph-css 5.0.3 (from 4.1.6)</li>



Re: svn commit: r1780681 - in /jmeter/trunk: LICENSE build.properties eclipse.classpath lib/ lib/aareadme.txt licenses/bin/README.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml

Posted by Felix Schumacher <fe...@internetallee.de>.
Am 28.01.2017 um 14:15 schrieb pmouawad@apache.org:
> Author: pmouawad
> Date: Sat Jan 28 13:15:34 2017
> New Revision: 1780681
>
> URL: http://svn.apache.org/viewvc?rev=1780681&view=rev
> Log:
> Updated to httpclient 4.5.3 (from 4.5.2)
This version contains the fix for the SPNegoScheme, so I will remove our 
workaround.

Note, that the SPNegoScheme contained in this release will not set 
mutual authentication nor delegation. So if this is needed, we would 
have to revert the removal again.

Regards,
  Felix
>
> Modified:
>      jmeter/trunk/LICENSE
>      jmeter/trunk/build.properties
>      jmeter/trunk/eclipse.classpath
>      jmeter/trunk/lib/   (props changed)
>      jmeter/trunk/lib/aareadme.txt
>      jmeter/trunk/licenses/bin/README.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=1780681&r1=1780680&r2=1780681&view=diff
> ==============================================================================
> --- jmeter/trunk/LICENSE [utf-8] (original)
> +++ jmeter/trunk/LICENSE [utf-8] Sat Jan 28 13:15:34 2017
> @@ -226,9 +226,10 @@ The following software is provided under
>   * excalibur-logger-1.1.jar
>   * groovy-all-2.4.8.jar
>   * httpasyncclient-4.1.2.jar
> -* httpclient-4.5.2.jar
> +* httpclient-4.5.3.jar
>   * httpcore-4.4.6.jar
>   * httpcore-nio-4.4.6.jar
> +* httpmime-4.5.3.jar
>   * jakarta-oro-2.0.8.jar
>   * jms-1.1.1.jar
>   * logkit-2.0.jar
>
> Modified: jmeter/trunk/build.properties
> URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1780681&r1=1780680&r2=1780681&view=diff
> ==============================================================================
> --- jmeter/trunk/build.properties (original)
> +++ jmeter/trunk/build.properties Sat Jan 28 13:15:34 2017
> @@ -181,24 +181,23 @@ hamcrest-core.loc            = ${maven2.
>   hamcrest-core.jar            = hamcrest-core-${hamcrest-core.version}.jar
>   hamcrest-core.md5            = 6393363b47ddcbba82321110c3e07519
>   
> -# Apache HttpClient 4.x
> -httpclient.version          = 4.5.2
> -#
> -httpclient.jar              = httpclient-${httpclient.version}.jar
> -httpclient.loc              = ${maven2.repo}/org/apache/httpcomponents/httpclient/${httpclient.version}
> -httpclient.md5              = e0a45df625cb96b69505e59bb25a0189
> -
>   # Apache HttpASyncClient 4.x
>   httpasyncclient.version          = 4.1.2
> -#
>   httpasyncclient.jar              = httpasyncclient-${httpasyncclient.version}.jar
>   httpasyncclient.loc              = ${maven2.repo}/org/apache/httpcomponents/httpasyncclient/${httpasyncclient.version}
>   httpasyncclient.md5              = 262ed539a7d65addfe71b40345671a00
>   
> +# Apache HttpClient 4.x
> +httpclient.version          = 4.5.3
> +#
> +httpclient.jar              = httpclient-${httpclient.version}.jar
> +httpclient.loc              = ${maven2.repo}/org/apache/httpcomponents/httpclient/${httpclient.version}
> +httpclient.md5              = 1965ebb7aca0f9f8faaed3870d8cf689
> +
>   # Required for HttpClient
>   httpmime.jar                = httpmime-${httpclient.version}.jar
>   httpmime.loc                = ${maven2.repo}/org/apache/httpcomponents/httpmime/${httpclient.version}
> -httpmime.md5                = 336fa980f7527be719fa997f5df8046f
> +httpmime.md5                = a00b6287cab2ad554ae3cbdbe983dc88
>   
>   # Required for HttpClient
>   httpcore.version            = 4.4.6
> @@ -206,7 +205,7 @@ httpcore.jar                = httpcore-$
>   httpcore.loc                = ${maven2.repo}/org/apache/httpcomponents/httpcore/${httpcore.version}
>   httpcore.md5                = a9fbd503e0802507efeeaffb56bbdf52
>   
> -# Required for HttpASyncClient
> +# Required for HttpASyncClient
>   httpcore-nio.version            = 4.4.6
>   httpcore-nio.jar                = httpcore-nio-${httpcore-nio.version}.jar
>   httpcore-nio.loc                = ${maven2.repo}/org/apache/httpcomponents/httpcore-nio/${httpcore-nio.version}
>
> Modified: jmeter/trunk/eclipse.classpath
> URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1780681&r1=1780680&r2=1780681&view=diff
> ==============================================================================
> --- jmeter/trunk/eclipse.classpath (original)
> +++ jmeter/trunk/eclipse.classpath Sat Jan 28 13:15:34 2017
> @@ -71,10 +71,10 @@
>       <classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
>       <classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
>       <classpathentry kind="lib" path="lib/httpasyncclient-4.1.2.jar"/>
> -    <classpathentry kind="lib" path="lib/httpclient-4.5.2.jar"/>
> +    <classpathentry kind="lib" path="lib/httpclient-4.5.3.jar"/>
>       <classpathentry kind="lib" path="lib/httpcore-nio-4.4.6.jar"/>
>       <classpathentry kind="lib" path="lib/httpcore-4.4.6.jar"/>
> -    <classpathentry kind="lib" path="lib/httpmime-4.5.2.jar"/>
> +    <classpathentry kind="lib" path="lib/httpmime-4.5.3.jar"/>
>       <classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
>       <classpathentry kind="lib" path="lib/jodd-core-3.8.1.jar"/>
>       <classpathentry kind="lib" path="lib/jodd-lagarto-3.8.1.jar"/>
>
> Propchange: jmeter/trunk/lib/
> ------------------------------------------------------------------------------
> --- svn:ignore (original)
> +++ svn:ignore Sat Jan 28 13:15:34 2017
> @@ -27,10 +27,10 @@ hamcrest-core-1.3.jar
>   geronimo*.jar
>   groovy-all-2.4.8.jar
>   httpasyncclient-4.1.2.jar
> -httpclient-4.5.2.jar
> +httpclient-4.5.3.jar
>   httpcore-4.4.6.jar
>   httpcore-nio-4.4.6.jar
> -httpmime-4.5.2.jar
> +httpmime-4.5.3.jar
>   jcharts-0.7.5.jar
>   jms*.jar
>   jodd-core-3.8.1.jar
>
> Modified: jmeter/trunk/lib/aareadme.txt
> URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1780681&r1=1780680&r2=1780681&view=diff
> ==============================================================================
> --- jmeter/trunk/lib/aareadme.txt (original)
> +++ jmeter/trunk/lib/aareadme.txt Sat Jan 28 13:15:34 2017
> @@ -193,7 +193,7 @@ junit 4.12
>   
>   HttpComponents
>   - HttpComponents Core 4.4.6
> -- HttpComponents Client 4.5.2
> +- HttpComponents Client 4.5.3
>   - HttpComponents AsyncClient 4.1.2
>   - HttpComponents Core NIO 4.4.6
>   -----------
>
> Modified: jmeter/trunk/licenses/bin/README.txt
> URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/README.txt?rev=1780681&r1=1780680&r2=1780681&view=diff
> ==============================================================================
> --- jmeter/trunk/licenses/bin/README.txt (original)
> +++ jmeter/trunk/licenses/bin/README.txt Sat Jan 28 13:15:34 2017
> @@ -20,9 +20,9 @@ commons-pool2-2.4.2.jar
>   excalibur-logger-1.1.jar
>   geronimo-jms_1.1_spec-1.1.1.jar
>   groovy-all-2.4.8.jar
> -httpclient-4.5.2.jar
> +httpclient-4.5.3.jar
>   httpcore-4.4.6.jar
> -httpmime-4.5.2.jar
> +httpmime-4.5.3.jar
>   jorphan.jar (part of JMeter)
>   logkit-2.0.jar
>   oro-2.0.8.jar
>
> Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
> URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1780681&r1=1780680&r2=1780681&view=diff
> ==============================================================================
> --- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
> +++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sat Jan 28 13:15:34 2017
> @@ -79,7 +79,7 @@ under the License.
>         <groovy-all.version>2.4.8</groovy-all.version>
>         <hamcrest-core.version>1.3</hamcrest-core.version>
>         <httpasyncclient.version>4.1.2</httpasyncclient.version>
> -      <httpclient.version>4.5.2</httpclient.version>
> +      <httpclient.version>4.5.3</httpclient.version>
>         <httpcore.version>4.4.6</httpcore.version>
>         <httpcore-nio.version>4.4.6</httpcore-nio.version>
>         <jakarta-oro.version>2.0.8</jakarta-oro.version>
>
> Modified: jmeter/trunk/xdocs/changes.xml
> URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1780681&r1=1780680&r2=1780681&view=diff
> ==============================================================================
> --- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
> +++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Jan 28 13:15:34 2017
> @@ -171,6 +171,7 @@ JMeter now requires Java 8. Ensure you u
>       <li>Updated to dnsjava-2.1.8.jar (from 2.1.7)</li>
>       <li>Updated to groovy 2.4.8 (from 2.4.7)</li>
>       <li>Updated to httpcore 4.4.6 (from 4.4.5)</li>
> +    <li>Updated to httpclient 4.5.3 (from 4.5.2)</li>
>       <li>Updated to jodd 3.8.1 (from 3.8.1.jar)</li>
>       <li>Updated to jsoup-1.10.2 (from 1.10.1)</li>
>       <li>Updated to ph-css 5.0.3 (from 4.1.6)</li>
>
>