View | Details | Raw Unified | Return to bug 62529
Collapse All | Expand All

(-)build.properties (-4 / +4 lines)
Lines 152-161 Link Here
152
dnsjava.md5                 = 540f330717bca9d29c8762cf6daca443
152
dnsjava.md5                 = 540f330717bca9d29c8762cf6daca443
153
153
154
# Freemarker
154
# Freemarker
155
freemarker.version          = 2.3.23
155
freemarker.version          = 2.3.28
156
freemarker.loc               = ${maven2.repo}/org/freemarker/freemarker/${freemarker.version}
156
freemarker.loc               = ${maven2.repo}/org/freemarker/freemarker/${freemarker.version}
157
freemarker.jar               = freemarker-${freemarker.version}.jar
157
freemarker.jar               = freemarker-${freemarker.version}.jar
158
freemarker.md5               = cbb1cec300ca98eea3c855cf395d4951
158
freemarker.md5               = c5e35d814518da7b0247d42311b8e296
159
159
160
# Groovy
160
# Groovy
161
groovy-all.version        = 2.4.15
161
groovy-all.version        = 2.4.15
Lines 182-191 Link Here
182
httpasyncclient.md5              = 73d4a443918f4f7124339d2161e2ae54
182
httpasyncclient.md5              = 73d4a443918f4f7124339d2161e2ae54
183
183
184
# Apache HttpClient 4.x
184
# Apache HttpClient 4.x
185
httpclient.version          = 4.5.5
185
httpclient.version          = 4.5.6
186
httpclient.jar              = httpclient-${httpclient.version}.jar
186
httpclient.jar              = httpclient-${httpclient.version}.jar
187
httpclient.loc              = ${maven2.repo}/org/apache/httpcomponents/httpclient/${httpclient.version}
187
httpclient.loc              = ${maven2.repo}/org/apache/httpcomponents/httpclient/${httpclient.version}
188
httpclient.md5              = 97e7e5b135476b7d25a5ab31e1ea4922
188
httpclient.md5              = 877aca56579fea38c6358d06408976ba
189
189
190
# Required for HttpClient
190
# Required for HttpClient
191
httpmime.version            = 4.5.5
191
httpmime.version            = 4.5.5
(-)eclipse.classpath (-2 / +2 lines)
Lines 63-75 Link Here
63
	<classpathentry kind="lib" path="lib/darcula.jar"/>
63
	<classpathentry kind="lib" path="lib/darcula.jar"/>
64
	<classpathentry kind="lib" path="lib/dec-0.1.2.jar"/>
64
	<classpathentry kind="lib" path="lib/dec-0.1.2.jar"/>
65
	<classpathentry kind="lib" path="lib/dnsjava-2.1.8.jar"/>
65
	<classpathentry kind="lib" path="lib/dnsjava-2.1.8.jar"/>
66
	<classpathentry kind="lib" path="lib/freemarker-2.3.23.jar"/>
66
	<classpathentry kind="lib" path="lib/freemarker-2.3.28.jar"/>
67
	<classpathentry kind="lib" path="lib/groovy-all-2.4.15.jar"/>
67
	<classpathentry kind="lib" path="lib/groovy-all-2.4.15.jar"/>
68
	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
68
	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
69
	<classpathentry kind="lib" path="lib/hamcrest-date-2.0.4.jar"/>
69
	<classpathentry kind="lib" path="lib/hamcrest-date-2.0.4.jar"/>
70
	<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
70
	<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
71
	<classpathentry kind="lib" path="lib/httpasyncclient-4.1.3.jar"/>
71
	<classpathentry kind="lib" path="lib/httpasyncclient-4.1.3.jar"/>
72
	<classpathentry kind="lib" path="lib/httpclient-4.5.5.jar"/>
72
	<classpathentry kind="lib" path="lib/httpclient-4.5.6.jar"/>
73
	<classpathentry kind="lib" path="lib/httpcore-nio-4.4.9.jar"/>
73
	<classpathentry kind="lib" path="lib/httpcore-nio-4.4.9.jar"/>
74
	<classpathentry kind="lib" path="lib/httpcore-4.4.9.jar"/>
74
	<classpathentry kind="lib" path="lib/httpcore-4.4.9.jar"/>
75
	<classpathentry kind="lib" path="lib/httpmime-4.5.5.jar"/>
75
	<classpathentry kind="lib" path="lib/httpmime-4.5.5.jar"/>
(-)lib/aareadme.txt (-2 / +2 lines)
Lines 111-117 Link Here
111
- unit tests, JUnit sampler
111
- unit tests, JUnit sampler
112
https://github.com/hamcrest/JavaHamcrest
112
https://github.com/hamcrest/JavaHamcrest
113
113
114
freemarker-2.3.23.jar
114
freemarker-2.3.28.jar
115
----------------------
115
----------------------
116
- used by Report/Dashboard feature
116
- used by Report/Dashboard feature
117
117
Lines 206-212 Link Here
206
206
207
HttpComponents
207
HttpComponents
208
- HttpComponents Core 4.4.9 
208
- HttpComponents Core 4.4.9 
209
- HttpComponents Client 4.5.5
209
- HttpComponents Client 4.5.6
210
- HttpComponents AsyncClient 4.1.3
210
- HttpComponents AsyncClient 4.1.3
211
- HttpComponents Core NIO 4.4.9
211
- HttpComponents Core NIO 4.4.9
212
-----------
212
-----------
(-)licenses/bin/freemarker-2.3.23.txt (-47 lines)
Lines 1-45 Link Here
1
Copyright 2014 Attila Szegedi, Daniel Dekany, Jonathan Revusky
2
3
Licensed under the Apache License, Version 2.0 (the "License");
4
you may not use this file except in compliance with the License.
5
You may obtain a copy of the License at
6
7
http://www.apache.org/licenses/LICENSE-2.0
8
9
Unless required by applicable law or agreed to in writing, software
10
distributed under the License is distributed on an "AS IS" BASIS,
11
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
See the License for the specific language governing permissions and
13
limitations under the License.
14
15
==============================================================================
16
END LICENSE
17
18
19
FreeMarker subcomponents with different copyright owners
20
--------------------------------------------------------
21
22
FreeMarker, both in its source code and binary form (freemarker.jar)
23
includes a number of files that are licensed by the Apache Software
24
Foundation under the Apache License, Version 2.0. This is the same
25
license as the license of FreeMaker, but the copyright owner is the
26
Apache Software Foundation. These files are:
27
  
28
    freemarker/ext/jsp/web-app_2_2.dtd
29
    freemarker/ext/jsp/web-app_2_3.dtd
30
    freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd
31
    freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd
32
33
34
Historical notes
35
----------------
36
37
FreeMarker 1.x was released under the LGPL license. Later, by
38
community consensus, we have switched over to a BSD-style license. As
39
of FreeMarker 2.2pre1, the original author, Benjamin Geer, has
40
relinquished the copyright in behalf of Visigoth Software Society.
41
42
With FreeMarker 2.3.21 the license has changed to Apache License,
43
Version 2.0, and the owner has changed from Visigoth Software Society
44
to three of the FreeMarker 2.x developers, Attila Szegedi, Daniel
45
Dekany, and Jonathan Revusky.
46
native
47
text/plain
(-)licenses/bin/freemarker-2.3.28.txt (+47 lines)
Line 0 Link Here
1
Copyright 2014 Attila Szegedi, Daniel Dekany, Jonathan Revusky
2
3
Licensed under the Apache License, Version 2.0 (the "License");
4
you may not use this file except in compliance with the License.
5
You may obtain a copy of the License at
6
7
http://www.apache.org/licenses/LICENSE-2.0
8
9
Unless required by applicable law or agreed to in writing, software
10
distributed under the License is distributed on an "AS IS" BASIS,
11
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
See the License for the specific language governing permissions and
13
limitations under the License.
14
15
==============================================================================
16
END LICENSE
17
18
19
FreeMarker subcomponents with different copyright owners
20
--------------------------------------------------------
21
22
FreeMarker, both in its source code and binary form (freemarker.jar)
23
includes a number of files that are licensed by the Apache Software
24
Foundation under the Apache License, Version 2.0. This is the same
25
license as the license of FreeMaker, but the copyright owner is the
26
Apache Software Foundation. These files are:
27
  
28
    freemarker/ext/jsp/web-app_2_2.dtd
29
    freemarker/ext/jsp/web-app_2_3.dtd
30
    freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd
31
    freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd
32
33
34
Historical notes
35
----------------
36
37
FreeMarker 1.x was released under the LGPL license. Later, by
38
community consensus, we have switched over to a BSD-style license. As
39
of FreeMarker 2.2pre1, the original author, Benjamin Geer, has
40
relinquished the copyright in behalf of Visigoth Software Society.
41
42
With FreeMarker 2.3.21 the license has changed to Apache License,
43
Version 2.0, and the owner has changed from Visigoth Software Society
44
to three of the FreeMarker 2.x developers, Attila Szegedi, Daniel
45
Dekany, and Jonathan Revusky.
46
native
47
text/plain
(-)res/maven/ApacheJMeter_parent.pom (-2 / +2 lines)
Lines 72-83 Link Here
72
      <commons-net.version>3.6</commons-net.version>
72
      <commons-net.version>3.6</commons-net.version>
73
      <commons-pool2.version>2.5.0</commons-pool2.version>
73
      <commons-pool2.version>2.5.0</commons-pool2.version>
74
      <dnsjava.version>2.1.8</dnsjava.version>
74
      <dnsjava.version>2.1.8</dnsjava.version>
75
      <freemarker.version>2.3.23</freemarker.version>
75
      <freemarker.version>2.3.28</freemarker.version>
76
      <groovy-all.version>2.4.15</groovy-all.version>
76
      <groovy-all.version>2.4.15</groovy-all.version>
77
      <hamcrest-core.version>1.3</hamcrest-core.version>
77
      <hamcrest-core.version>1.3</hamcrest-core.version>
78
      <hamcrest-date.version>2.0.4</hamcrest-date.version>
78
      <hamcrest-date.version>2.0.4</hamcrest-date.version>
79
      <httpasyncclient.version>4.1.3</httpasyncclient.version>
79
      <httpasyncclient.version>4.1.3</httpasyncclient.version>
80
      <httpclient.version>4.5.5</httpclient.version>
80
      <httpclient.version>4.5.6</httpclient.version>
81
      <httpcore.version>4.4.9</httpcore.version>
81
      <httpcore.version>4.4.9</httpcore.version>
82
      <httpcore-nio.version>4.4.9</httpcore-nio.version>
82
      <httpcore-nio.version>4.4.9</httpcore-nio.version>
83
      <httpmime.version>4.5.5</httpmime.version>
83
      <httpmime.version>4.5.5</httpmime.version>

Return to bug 62529