Skip to content

Commit c2d0b2a

Browse files
pmouawadpmouawad
committed
Updated to log4j-2.11.1 (from log4j-2.11.0)
git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1849624 13f79535-47bb-0310-9956-ffa450edef68 Former-commit-id: a662c3c
1 parent c6f8db1 commit c2d0b2a

File tree

9 files changed

+28
-27
lines changed

9 files changed

+28
-27
lines changed

‎LICENSE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,10 @@ The following software is provided under the Apache License V 2.0 (as above):
232232
* httpmime-4.5.6.jar
233233
* jakarta-oro-2.0.8.jar
234234
* jms-1.1.1.jar
235-
* log4j-1.2-api-2.11.0.jar
236-
* log4j-api-2.11.0.jar
237-
* log4j-core-2.11.0.jar
238-
* log4j-slf4j-impl-2.11.0.jar
235+
* log4j-1.2-api-2.11.1.jar
236+
* log4j-api-2.11.1.jar
237+
* log4j-core-2.11.1.jar
238+
* log4j-slf4j-impl-2.11.1.jar
239239
* serializer-2.7.2.jar
240240
* startbootstrap-sb-admin-2-1.0.7
241241
* tika-core-1.19.1.jar

‎bin/mirror-server.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ set JMETER_CMD_LINE_ARGS=%*
2626
cd /D %~dp0
2727

2828
set CP=..\lib\ext\ApacheJMeter_http.jar;..\lib\ext\ApacheJMeter_core.jar;..\lib\jorphan.jar;..\lib\oro-2.0.8.jar
29-
set CP=%CP%;..\lib\slf4j-api-1.7.25.jar;..\lib\jcl-over-slf4j-1.7.25.jar;..\lib\log4j-slf4j-impl-2.11.0.jar
30-
set CP=%CP%;..\lib\log4j-api-2.11.0.jar;..\lib\log4j-core-2.11.0.jar;..\lib\log4j-1.2-api-2.11.0.jar
29+
set CP=%CP%;..\lib\slf4j-api-1.7.25.jar;..\lib\jcl-over-slf4j-1.7.25.jar;..\lib\log4j-slf4j-impl-2.11.1.jar
30+
set CP=%CP%;..\lib\log4j-api-2.11.1.jar;..\lib\log4j-core-2.11.1.jar;..\lib\log4j-1.2-api-2.11.1.jar
3131

3232
java -cp %CP% org.apache.jmeter.protocol.http.control.HttpMirrorServer %JMETER_CMD_LINE_ARGS%
3333

‎bin/mirror-server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ cd "$(dirname "$0")" || exit 1
2222

2323
CP=../lib/ext/ApacheJMeter_http.jar:../lib/ext/ApacheJMeter_core.jar:../lib/jorphan.jar:../lib/oro-2.0.8.jar
2424
CP=${CP}:../lib/slf4j-api-1.7.25.jar:../lib/jcl-over-slf4j-1.7.25.jar:../lib/log4j-slf4j-impl-2.11.0.jar
25-
CP=${CP}:../lib/log4j-api-2.11.0.jar:../lib/log4j-core-2.11.0.jar:../lib/log4j-1.2-api-2.11.0.jar
25+
CP=${CP}:../lib/log4j-api-2.11.1.jar:../lib/log4j-core-2.11.1.jar:../lib/log4j-1.2-api-2.11.1.jar
2626

2727
java -cp $CP org.apache.jmeter.protocol.http.control.HttpMirrorServer "$@"

‎build.properties

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -325,25 +325,25 @@ jcl-over-slf4j.jar = jcl-over-slf4j-${jcl-over-slf4j.version}.jar
325325
jcl-over-slf4j.loc = ${maven2.repo}/org/slf4j/jcl-over-slf4j/${jcl-over-slf4j.version}
326326
jcl-over-slf4j.sha512 = 0A703864B269DE6F7BC98DF0FA98AA943CC327A4CA2915899D460E4A071FCC3FBE70957EB91B740CC935D0960B3D98F30C54A0A4019D7AE8C6D50F51EDB8D149
327327

328-
log4j-api.version = 2.11.0
328+
log4j-api.version = 2.11.1
329329
log4j-api.jar = log4j-api-${log4j-api.version}.jar
330330
log4j-api.loc = ${maven2.repo}/org/apache/logging/log4j/log4j-api/${log4j-api.version}
331-
log4j-api.sha512 = 72E37483A4BD3F338885A08242005E76347D13F879937ACCCB4B3DFF3909D832BDF8B7091D4BC1E6F201A43D906D348F0FA27BFEFDDCE7D27F13E23604B7E570
331+
log4j-api.sha512 = A598DA3836D2DDCA60CFB3D62DF96E525A8A130CB67199C3FA0380E722B82B8F5778372CCCB763BF8AC216112C3E5E6300FC5B85E097845F42FB743ADC1FD41F
332332

333-
log4j-core.version = 2.11.0
333+
log4j-core.version = 2.11.1
334334
log4j-core.jar = log4j-core-${log4j-core.version}.jar
335335
log4j-core.loc = ${maven2.repo}/org/apache/logging/log4j/log4j-core/${log4j-core.version}
336-
log4j-core.sha512 = C79153BAE0743D9130C4697216C941FA5261D1CA1A7AF8D78C4EBB8CEEB28E0D3BEFEF98895042FDD31B5B9C17E5408EA60490B108618A1B83C2D146E3D816F2
336+
log4j-core.sha512 = 6D23ECAF0AC18A5DFF492B8F047543B392FE5D1D56EF1F9F6C68CFF43C7EE97F2FD8521C22D242E5ACBFF9C133E9315045D6C689609F9C7DA3DDFC3FFB96B261
337337

338-
log4j-1.2-api.version = 2.11.0
338+
log4j-1.2-api.version = 2.11.1
339339
log4j-1.2-api.jar = log4j-1.2-api-${log4j-1.2-api.version}.jar
340340
log4j-1.2-api.loc = ${maven2.repo}/org/apache/logging/log4j/log4j-1.2-api/${log4j-1.2-api.version}
341-
log4j-1.2-api.sha512 = 17DB99E9F53DAF78F3699E68CD02271B41335BE702E0356B642042D9A2848EB8EB5E40279546CDE146FCFC56EC28A67D096F4EE8720268FEC1CAEAEFB5BC1B48
341+
log4j-1.2-api.sha512 = 7FA86AE3F19F88C0690D12F7ACD04D270E365C1E925DF0A8012DDE7B8B3EA1F787D34C9FC26B198D7D8054F7BFADB522A34C4B8C1C7998E7C138187C5DA4060E
342342

343-
log4j-slf4j-impl.version = 2.11.0
343+
log4j-slf4j-impl.version = 2.11.1
344344
log4j-slf4j-impl.jar = log4j-slf4j-impl-${log4j-slf4j-impl.version}.jar
345345
log4j-slf4j-impl.loc = ${maven2.repo}/org/apache/logging/log4j/log4j-slf4j-impl/${log4j-slf4j-impl.version}
346-
log4j-slf4j-impl.sha512 = 4082692C66F3511183541D1ADB9E00031FCF0761A7EF84F4317C77AC314473FF1971C9B610EB97358FA8FCE147E2953B2F3E6C9EBC7B893883ED5466984C609F
346+
log4j-slf4j-impl.sha512 = 55360BF9BCD47DAE49FCC8E28DBAD9D3AA26BCC66729DA98D701CC2099CB070E537F19327FA52486B4E557FA513D37AFBBE6FD17B1557527FB2496F56072545A
347347

348348
sonarqube-ant-task.version = 2.5
349349
sonarqube-ant-task.jar = sonarqube-ant-task-${sonarqube-ant-task.version}.jar

‎eclipse.classpath

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@
8787
<classpathentry kind="lib" path="lib/jsoup-1.11.3.jar"/>
8888
<classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
8989
<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
90-
<classpathentry kind="lib" path="lib/log4j-api-2.11.0.jar"/>
91-
<classpathentry kind="lib" path="lib/log4j-core-2.11.0.jar"/>
92-
<classpathentry kind="lib" path="lib/log4j-slf4j-impl-2.11.0.jar"/>
93-
<classpathentry kind="lib" path="lib/log4j-1.2-api-2.11.0.jar"/>
90+
<classpathentry kind="lib" path="lib/log4j-api-2.11.1.jar"/>
91+
<classpathentry kind="lib" path="lib/log4j-core-2.11.1.jar"/>
92+
<classpathentry kind="lib" path="lib/log4j-slf4j-impl-2.11.1.jar"/>
93+
<classpathentry kind="lib" path="lib/log4j-1.2-api-2.11.1.jar"/>
9494
<classpathentry kind="lib" path="lib/mail-1.5.0-b01.jar"/>
9595
<classpathentry kind="lib" path="lib/mongo-java-driver-2.11.3.jar"/>
9696
<classpathentry kind="lib" path="lib/oro-2.0.8.jar"/>

‎lib/aareadme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jsoup-1.11.3
171171
http://www.jsoup.org/
172172
- CSS/JQuery like extractor
173173

174-
log4j2-2.11.0
174+
log4j2-2.11.1
175175
--------
176176
https://logging.apache.org/log4j/2.x/
177177
- Logging framework

‎res/maven/ApacheJMeter_parent.pom

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ under the License.
103103
<Saxon-HE.version>9.8.0-12</Saxon-HE.version>
104104
<slf4j-api.version>1.7.25</slf4j-api.version>
105105
<slf4j-ext.version>1.7.25</slf4j-ext.version>
106-
<log4j-api.version>2.11.0</log4j-api.version>
107-
<log4j-core.version>2.11.0</log4j-core.version>
108-
<log4j-slf4j-impl.version>2.11.0</log4j-slf4j-impl.version>
109-
<log4j-1.2-api.version>2.11.0</log4j-1.2-api.version>
106+
<log4j-api.version>2.11.1</log4j-api.version>
107+
<log4j-core.version>2.11.1</log4j-core.version>
108+
<log4j-slf4j-impl.version>2.11.1</log4j-slf4j-impl.version>
109+
<log4j-1.2-api.version>2.11.1</log4j-1.2-api.version>
110110
<spock-core.version>1.0-groovy-2.4</spock-core.version>
111111
<cglib-nodep.version>3.2.9</cglib-nodep.version>
112112
<objenesis.version>2.6</objenesis.version>

‎xdocs/changes.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ of previous time slot as a base. Starting with this version, each time slot is i
140140
<li>Updated to jsoup-1.11.3 (from 1.11.2)</li>
141141
<li>Updated to cglib-nodep-3.2.9 (from cglib-nodep-3.2.7)</li>
142142
<li>Updated to ph-commons-9.2.0 (from ph-commons-9.1.2)</li>
143+
<li>Updated to log4j-2.11.1 (from log4j-2.11.0)</li>
143144
<li><bug>62818</bug>Updated to xercesImpl to 2.12.0 (from 2.11.0). Reported by Stefan Seide (stefan at trilobyte-se.de)</li>
144145
<li><bug>62821</bug><pr>405</pr>Use SHA-512 checksums instead of MD5 to verify jar downloads</li>
145146
<li><pr>408</pr>Log an informational message instead of an stack trace, when JavaFX is not found for the <code>RenderInBrowser</code> component.</li>

‎xdocs/usermanual/remote-test.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,19 +383,19 @@ grant codeBase "file:${jmeter.home}/lib/jorphan.jar" {
383383
permission java.security.AllPermission;
384384
};
385385

386-
grant codeBase "file:${jmeter.home}/lib/log4j-api-2.11.0.jar" {
386+
grant codeBase "file:${jmeter.home}/lib/log4j-api-2.11.1.jar" {
387387
permission java.security.AllPermission;
388388
};
389389

390-
grant codeBase "file:${jmeter.home}/lib/log4j-slf4j-impl-2.11.0.jar" {
390+
grant codeBase "file:${jmeter.home}/lib/log4j-slf4j-impl-2.11.1.jar" {
391391
permission java.security.AllPermission;
392392
};
393393

394394
grant codeBase "file:${jmeter.home}/lib/slf4j-api-1.7.25.jar" {
395395
permission java.security.AllPermission;
396396
};
397397

398-
grant codeBase "file:${jmeter.home}/lib/log4j-core-2.11.0.jar" {
398+
grant codeBase "file:${jmeter.home}/lib/log4j-core-2.11.1.jar" {
399399
permission java.security.AllPermission;
400400
};
401401

0 commit comments

Comments
 (0)