Author: pmouawad
Date: Sun May 28 20:41:43 2017
New Revision: 1796535
URL: http://svn.apache.org/viewvc?rev=1796535&view=rev
Log:
Update log4j2 to 2.8.2 from 2.8.1
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/bin/mirror-server.cmd
jmeter/trunk/bin/mirror-server.sh
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=1796535&r1=1796534&r2=1796535&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun May 28 20:41:43 2017
@@ -229,10 +229,10 @@ The following software is provided under
* httpmime-4.5.3.jar
* jakarta-oro-2.0.8.jar
* jms-1.1.1.jar
-* log4j-1.2-api-2.8.1.jar
-* log4j-api-2.8.1.jar
-* log4j-core-2.8.1.jar
-* log4j-slf4j-impl-2.8.1.jar
+* log4j-1.2-api-2.8.2.jar
+* log4j-api-2.8.2.jar
+* log4j-core-2.8.2.jar
+* log4j-slf4j-impl-2.8.2.jar
* serializer-2.7.2.jar
* startbootstrap-sb-admin-2-1.0.7
* tika-core-1.14.jar
Modified: jmeter/trunk/bin/mirror-server.cmd
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/mirror-server.cmd?rev=1796535&r1=1796534&r2=1796535&view=diff
==============================================================================
--- jmeter/trunk/bin/mirror-server.cmd (original)
+++ jmeter/trunk/bin/mirror-server.cmd Sun May 28 20:41:43 2017
@@ -26,8 +26,8 @@ set JMETER_CMD_LINE_ARGS=%*
cd /D %~dp0
set
CP=..\lib\ext\ApacheJMeter_http.jar;..\lib\ext\ApacheJMeter_core.jar;..\lib\jorphan.jar;..\lib\oro-2.0.8.jar
-set
CP=%CP%;..\lib\slf4j-api-1.7.25.jar;..\lib\jcl-over-slf4j-1.7.25.jar;..\lib\log4j-slf4j-impl-2.8.1.jar
-set
CP=%CP%;..\lib\log4j-api-2.8.1.jar;..\lib\log4j-core-2.8.1.jar;..\lib\log4j-1.2-api-2.8.1.jar
+set
CP=%CP%;..\lib\slf4j-api-1.7.25.jar;..\lib\jcl-over-slf4j-1.7.25.jar;..\lib\log4j-slf4j-impl-2.8.2.jar
+set
CP=%CP%;..\lib\log4j-api-2.8.2.jar;..\lib\log4j-core-2.8.2.jar;..\lib\log4j-1.2-api-2.8.2.jar
java -cp %CP% org.apache.jmeter.protocol.http.control.HttpMirrorServer
%JMETER_CMD_LINE_ARGS%
Modified: jmeter/trunk/bin/mirror-server.sh
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/mirror-server.sh?rev=1796535&r1=1796534&r2=1796535&view=diff
==============================================================================
--- jmeter/trunk/bin/mirror-server.sh (original)
+++ jmeter/trunk/bin/mirror-server.sh Sun May 28 20:41:43 2017
@@ -21,7 +21,7 @@
cd `dirname $0`
CP=../lib/ext/ApacheJMeter_http.jar:../lib/ext/ApacheJMeter_core.jar:../lib/jorphan.jar:../lib/oro-2.0.8.jar
-CP=${CP}:../lib/slf4j-api-1.7.25.jar:../lib/jcl-over-slf4j-1.7.25.jar:../lib/log4j-slf4j-impl-2.8.1.jar
-CP=${CP}:../lib/log4j-api-2.8.1.jar:../lib/log4j-core-2.8.1.jar:../lib/log4j-1.2-api-2.8.1.jar
+CP=${CP}:../lib/slf4j-api-1.7.25.jar:../lib/jcl-over-slf4j-1.7.25.jar:../lib/log4j-slf4j-impl-2.8.2.jar
+CP=${CP}:../lib/log4j-api-2.8.2.jar:../lib/log4j-core-2.8.2.jar:../lib/log4j-1.2-api-2.8.2.jar
java -cp $CP org.apache.jmeter.protocol.http.control.HttpMirrorServer "$@"
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1796535&r1=1796534&r2=1796535&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun May 28 20:41:43 2017
@@ -291,25 +291,25 @@ jcl-over-slf4j.jar = jcl-over-s
jcl-over-slf4j.loc =
${maven2.repo}/org/slf4j/jcl-over-slf4j/${jcl-over-slf4j.version}
jcl-over-slf4j.md5 = 56b22adc639b09b2e917f42d68b26600
-log4j-api.version = 2.8.1
+log4j-api.version = 2.8.2
log4j-api.jar = log4j-api-${log4j-api.version}.jar
log4j-api.loc =
${maven2.repo}/org/apache/logging/log4j/log4j-api/${log4j-api.version}
-log4j-api.md5 = a2ad9b058b4b03d43f3cc301701654e4
+log4j-api.md5 = 37a3c575526522537cd4e1bc3c5a2025
-log4j-core.version = 2.8.1
+log4j-core.version = 2.8.2
log4j-core.jar = log4j-core-${log4j-core.version}.jar
log4j-core.loc =
${maven2.repo}/org/apache/logging/log4j/log4j-core/${log4j-core.version}
-log4j-core.md5 = 547bb3ed2deb856d0e3bbd77c27b9625
+log4j-core.md5 = 4a5177a172764bda6f4472b94ba17ccb
-log4j-1.2-api.version = 2.8.1
+log4j-1.2-api.version = 2.8.2
log4j-1.2-api.jar = log4j-1.2-api-${log4j-1.2-api.version}.jar
log4j-1.2-api.loc =
${maven2.repo}/org/apache/logging/log4j/log4j-1.2-api/${log4j-1.2-api.version}
-log4j-1.2-api.md5 = a13729b7ed3f03bdf77d19d0ffef689b
+log4j-1.2-api.md5 = be59f08f56716921261012d11f18fb8c
-log4j-slf4j-impl.version = 2.8.1
+log4j-slf4j-impl.version = 2.8.2
log4j-slf4j-impl.jar = log4j-slf4j-impl-${log4j-slf4j-impl.version}.jar
log4j-slf4j-impl.loc =
${maven2.repo}/org/apache/logging/log4j/log4j-slf4j-impl/${log4j-slf4j-impl.version}
-log4j-slf4j-impl.md5 = 3d33552faea500cc4fd0414cf2abdca7
+log4j-slf4j-impl.md5 = c30f4bbb318e29d81004cda30a7491bf
sonarqube-ant-task.version = 2.5
sonarqube-ant-task.jar =
sonarqube-ant-task-${sonarqube-ant-task.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1796535&r1=1796534&r2=1796535&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun May 28 20:41:43 2017
@@ -93,10 +93,10 @@
<classpathentry kind="lib" path="lib/serializer-2.7.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.25.jar"/>
<classpathentry kind="lib" path="lib/slf4j-ext-1.7.25.jar"/>
- <classpathentry kind="lib" path="lib/log4j-api-2.8.1.jar"/>
- <classpathentry kind="lib" path="lib/log4j-core-2.8.1.jar"/>
- <classpathentry kind="lib" path="lib/log4j-slf4j-impl-2.8.1.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2-api-2.8.1.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-api-2.8.2.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-core-2.8.2.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-slf4j-impl-2.8.2.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2-api-2.8.2.jar"/>
<classpathentry kind="lib" path="lib/tika-core-1.14.jar"/>
<classpathentry kind="lib" path="lib/tika-parsers-1.14.jar"/>
<classpathentry kind="lib" path="lib/xalan-2.7.2.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun May 28 20:41:43 2017
@@ -42,10 +42,10 @@ json-smart-2.3.jar
jsoup-1.10.2.jar
jtidy-r*.jar
junit-4.12.jar
-log4j-1.2-api-2.8.1.jar
-log4j-api-2.8.1.jar
-log4j-core-2.8.1.jar
-log4j-slf4j-impl-2.8.1.jar
+log4j-1.2-api-2.8.2.jar
+log4j-api-2.8.2.jar
+log4j-core-2.8.2.jar
+log4j-slf4j-impl-2.8.2.jar
mail-1.5.0-b01.jar
mongo-java-driver-2.11.3.jar
ph-css-5.0.4.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1796535&r1=1796534&r2=1796535&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun May 28 20:41:43 2017
@@ -152,7 +152,7 @@ jsoup-1.10.2
http://www.jsoup.org/
- CSS/JQuery like extractor
-log4j2
+log4j2-2.8.2
--------
https://logging.apache.org/log4j/2.x/
- Logging framework
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1796535&r1=1796534&r2=1796535&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun May 28 20:41:43 2017
@@ -99,10 +99,10 @@ under the License.
<rsyntaxtextarea.version>2.6.1</rsyntaxtextarea.version>
<slf4j-api.version>1.7.25</slf4j-api.version>
<slf4j-ext.version>1.7.25</slf4j-ext.version>
- <log4j-api.version>2.8.1</log4j-api.version>
- <log4j-core.version>2.8.1</log4j-core.version>
- <log4j-slf4j-impl.version>2.8.1</log4j-slf4j-impl.version>
- <log4j-1.2-api.version>2.8.1</log4j-1.2-api.version>
+ <log4j-api.version>2.8.2</log4j-api.version>
+ <log4j-core.version>2.8.2</log4j-core.version>
+ <log4j-slf4j-impl.version>2.8.2</log4j-slf4j-impl.version>
+ <log4j-1.2-api.version>2.8.2</log4j-1.2-api.version>
<jtidy.version>r938</jtidy.version>
<tika-core.version>1.14</tika-core.version>
<tika-parsers.version>1.14</tika-parsers.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1796535&r1=1796534&r2=1796535&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun May 28 20:41:43 2017
@@ -131,6 +131,7 @@ Summary
<li>Updated to commons-jexl3 3.1 (from 3.0)</li>
<li>Updated to ph-css 5.0.4 (from 5.0.3)</li>
<li>Updated to ph-commons 8.6.5 (from 8.6.0)</li>
+ <li>Updated to log4j2 2.8.2 (from 2.8.1)</li>
</ul>
<!-- =================== Bug fixes =================== -->
