Bug 62529

Summary:	Upgrade Freemaker and Apache HttpClient
Product:	JMeter - Now in Github	Reporter:	orimarko <orimarko>
Component:	Main	Assignee:	JMeter issues mailing list <issues>
Status:	RESOLVED FIXED
Severity:	normal	CC:	orimarko, p.mouawad
Priority:	P2	Keywords:	FixedInTrunk
Version:	4.0
Target Milestone:	JMETER_5.0
Hardware:	All
OS:	All
Attachments:	Patch with upgrade versions

Description orimarko 2018-07-11 11:24:01 UTC

We can upgrade the following:

Upgrade Freemaker to 2.3.28
Upgrade Apache HttpClient to 4.5.6

Comment 1 Felix Schumacher 2018-07-11 16:31:31 UTC

Would you be able to create a patch?

Comment 2 orimarko 2018-07-12 05:32:04 UTC

What about file licenses\bin\freemarker-2.3.23.txt?  should we rename it to freemarker.txt?

Comment 3 Felix Schumacher 2018-07-14 14:05:42 UTC

(In reply to orimarko from comment #2)
> What about file licenses\bin\freemarker-2.3.23.txt?  should we rename it to
> freemarker.txt?

Rename the license file to the current version (assuming it hasn't changed). You can have a look at r1826466 for a similar operation in our subversion repo.

Comment 4 orimarko 2018-07-15 05:52:27 UTC

Created attachment 36031 [details]
Patch with upgrade versions

Comment 5 Felix Schumacher 2018-07-15 10:10:19 UTC

Thanks for your contribution.

I added the svn:ignore entries for the libraries and adapted the LICENCE file to reflect the changes.

 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

Comment 6 The ASF infrastructure team 2022-09-24 20:38:14 UTC

This issue has been migrated to GitHub: https://github.com/apache/jmeter/issues/4817