You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2018/07/15 10:03:58 UTC
svn commit: r1835958 - in /jmeter/trunk: LICENSE build.properties
eclipse.classpath lib/ lib/aareadme.txt licenses/bin/freemarker-2.3.23.txt
licenses/bin/freemarker-2.3.28.txt res/maven/ApacheJMeter_parent.pom
xdocs/changes.xml
Author: fschumacher
Date: Sun Jul 15 10:03:58 2018
New Revision: 1835958
URL: http://svn.apache.org/viewvc?rev=1835958&view=rev
Log:
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)
Bugzilla Id: 62529
Added:
jmeter/trunk/licenses/bin/freemarker-2.3.28.txt (with props)
Removed:
jmeter/trunk/licenses/bin/freemarker-2.3.23.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=1835958&r1=1835957&r2=1835958&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Jul 15 10:03:58 2018
@@ -225,7 +225,7 @@ The following software is provided under
* dec-0.1.2.jar
* groovy-all-2.4.15.jar
* httpasyncclient-4.1.3.jar
-* httpclient-4.5.5.jar
+* httpclient-4.5.6.jar
* httpcore-4.4.9.jar
* httpcore-nio-4.4.9.jar
* httpmime-4.5.5.jar
@@ -249,7 +249,7 @@ The following software is provided under
* accessors-smart-1.2.jar
* caffeine-2.6.1.jar
* darcula.jar
-* freemarker-2.3.23.jar (AL2.0, see licenses/bin for additional info)
+* freemarker-2.3.28.jar (AL2.0, see licenses/bin for additional info)
* json-path-2.4.0.jar
* json-smart-2.3.jar
* mongo-java-driver-2.11.3.jar
@@ -284,4 +284,4 @@ For details, please see the files under:
* xpp3-1.1.4c.jar (Indiana University Extreme! Lab Software License 1.1.1)
* xstream-1.4.10.jar (BSD)
* hamcrest-date-2.0.4.jar (BSD)
-* Saxon-HE-9.8.0-12.jar (Mozilla Public License version 2.0)
\ No newline at end of file
+* Saxon-HE-9.8.0-12.jar (Mozilla Public License version 2.0)
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1835958&r1=1835957&r2=1835958&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Jul 15 10:03:58 2018
@@ -152,10 +152,10 @@ dnsjava.loc = ${maven2.r
dnsjava.md5 = 540f330717bca9d29c8762cf6daca443
# Freemarker
-freemarker.version = 2.3.23
+freemarker.version = 2.3.28
freemarker.loc = ${maven2.repo}/org/freemarker/freemarker/${freemarker.version}
freemarker.jar = freemarker-${freemarker.version}.jar
-freemarker.md5 = cbb1cec300ca98eea3c855cf395d4951
+freemarker.md5 = c5e35d814518da7b0247d42311b8e296
# Groovy
groovy-all.version = 2.4.15
@@ -182,10 +182,10 @@ httpasyncclient.loc = ${mav
httpasyncclient.md5 = 73d4a443918f4f7124339d2161e2ae54
# Apache HttpClient 4.x
-httpclient.version = 4.5.5
+httpclient.version = 4.5.6
httpclient.jar = httpclient-${httpclient.version}.jar
httpclient.loc = ${maven2.repo}/org/apache/httpcomponents/httpclient/${httpclient.version}
-httpclient.md5 = 97e7e5b135476b7d25a5ab31e1ea4922
+httpclient.md5 = 877aca56579fea38c6358d06408976ba
# Required for HttpClient
httpmime.version = 4.5.5
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1835958&r1=1835957&r2=1835958&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Jul 15 10:03:58 2018
@@ -63,13 +63,13 @@
<classpathentry kind="lib" path="lib/darcula.jar"/>
<classpathentry kind="lib" path="lib/dec-0.1.2.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/freemarker-2.3.28.jar"/>
<classpathentry kind="lib" path="lib/groovy-all-2.4.15.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-date-2.0.4.jar"/>
<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/httpasyncclient-4.1.3.jar"/>
- <classpathentry kind="lib" path="lib/httpclient-4.5.5.jar"/>
+ <classpathentry kind="lib" path="lib/httpclient-4.5.6.jar"/>
<classpathentry kind="lib" path="lib/httpcore-nio-4.4.9.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.4.9.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.5.5.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 15 10:03:58 2018
@@ -23,13 +23,13 @@ commons-text-1.1.jar
darcula.jar
dec-0.1.2.jar
dnsjava-2.1.8.jar
-freemarker-2.3.23.jar
+freemarker-2.3.28.jar
hamcrest-core-1.3.jar
geronimo*.jar
groovy-all-2.4.15.jar
hamcrest-date-2.0.4.jar
httpasyncclient-4.1.3.jar
-httpclient-4.5.5.jar
+httpclient-4.5.6.jar
httpcore-4.4.9.jar
httpcore-nio-4.4.9.jar
httpmime-4.5.5.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1835958&r1=1835957&r2=1835958&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Jul 15 10:03:58 2018
@@ -111,7 +111,7 @@ hamcrest-core-1.3
- unit tests, JUnit sampler
https://github.com/hamcrest/JavaHamcrest
-freemarker-2.3.23.jar
+freemarker-2.3.28.jar
----------------------
- used by Report/Dashboard feature
@@ -206,7 +206,7 @@ junit 4.12
HttpComponents
- HttpComponents Core 4.4.9
-- HttpComponents Client 4.5.5
+- HttpComponents Client 4.5.6
- HttpComponents AsyncClient 4.1.3
- HttpComponents Core NIO 4.4.9
-----------
Added: jmeter/trunk/licenses/bin/freemarker-2.3.28.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/freemarker-2.3.28.txt?rev=1835958&view=auto
==============================================================================
--- jmeter/trunk/licenses/bin/freemarker-2.3.28.txt (added)
+++ jmeter/trunk/licenses/bin/freemarker-2.3.28.txt Sun Jul 15 10:03:58 2018
@@ -0,0 +1,45 @@
+Copyright 2014 Attila Szegedi, Daniel Dekany, Jonathan Revusky
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+==============================================================================
+END LICENSE
+
+
+FreeMarker subcomponents with different copyright owners
+--------------------------------------------------------
+
+FreeMarker, both in its source code and binary form (freemarker.jar)
+includes a number of files that are licensed by the Apache Software
+Foundation under the Apache License, Version 2.0. This is the same
+license as the license of FreeMaker, but the copyright owner is the
+Apache Software Foundation. These files are:
+
+ freemarker/ext/jsp/web-app_2_2.dtd
+ freemarker/ext/jsp/web-app_2_3.dtd
+ freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd
+ freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd
+
+
+Historical notes
+----------------
+
+FreeMarker 1.x was released under the LGPL license. Later, by
+community consensus, we have switched over to a BSD-style license. As
+of FreeMarker 2.2pre1, the original author, Benjamin Geer, has
+relinquished the copyright in behalf of Visigoth Software Society.
+
+With FreeMarker 2.3.21 the license has changed to Apache License,
+Version 2.0, and the owner has changed from Visigoth Software Society
+to three of the FreeMarker 2.x developers, Attila Szegedi, Daniel
+Dekany, and Jonathan Revusky.
\ No newline at end of file
Propchange: jmeter/trunk/licenses/bin/freemarker-2.3.28.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1835958&r1=1835957&r2=1835958&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Jul 15 10:03:58 2018
@@ -72,12 +72,12 @@ under the License.
<commons-net.version>3.6</commons-net.version>
<commons-pool2.version>2.5.0</commons-pool2.version>
<dnsjava.version>2.1.8</dnsjava.version>
- <freemarker.version>2.3.23</freemarker.version>
+ <freemarker.version>2.3.28</freemarker.version>
<groovy-all.version>2.4.15</groovy-all.version>
<hamcrest-core.version>1.3</hamcrest-core.version>
<hamcrest-date.version>2.0.4</hamcrest-date.version>
<httpasyncclient.version>4.1.3</httpasyncclient.version>
- <httpclient.version>4.5.5</httpclient.version>
+ <httpclient.version>4.5.6</httpclient.version>
<httpcore.version>4.4.9</httpcore.version>
<httpcore-nio.version>4.4.9</httpcore-nio.version>
<httpmime.version>4.5.5</httpmime.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1835958&r1=1835957&r2=1835958&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Jul 15 10:03:58 2018
@@ -168,6 +168,7 @@ this behaviour, set <code>httpclient.res
<li>Updated to asm-6.1 (from 6.1)</li>
<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>
</ul>
<!-- =================== Bug fixes =================== -->