jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1849624 - in /jmeter/trunk: LICENSE bin/mirror-server.cmd bin/mirror-server.sh build.properties eclipse.classpath lib/ lib/aareadme.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml xdocs/usermanual/remote-test.xml
Date Sun, 23 Dec 2018 13:51:46 GMT
Author: pmouawad
Date: Sun Dec 23 13:51:45 2018
New Revision: 1849624

URL: http://svn.apache.org/viewvc?rev=1849624&view=rev
Log:
Updated to log4j-2.11.1 (from log4j-2.11.0)

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
    jmeter/trunk/xdocs/usermanual/remote-test.xml

Modified: jmeter/trunk/LICENSE
URL: http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1849624&r1=1849623&r2=1849624&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Dec 23 13:51:45 2018
@@ -232,10 +232,10 @@ The following software is provided under
 * httpmime-4.5.6.jar
 * jakarta-oro-2.0.8.jar
 * jms-1.1.1.jar
-* log4j-1.2-api-2.11.0.jar
-* log4j-api-2.11.0.jar
-* log4j-core-2.11.0.jar
-* log4j-slf4j-impl-2.11.0.jar
+* log4j-1.2-api-2.11.1.jar
+* log4j-api-2.11.1.jar
+* log4j-core-2.11.1.jar
+* log4j-slf4j-impl-2.11.1.jar
 * serializer-2.7.2.jar
 * startbootstrap-sb-admin-2-1.0.7
 * tika-core-1.19.1.jar

Modified: jmeter/trunk/bin/mirror-server.cmd
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/mirror-server.cmd?rev=1849624&r1=1849623&r2=1849624&view=diff
==============================================================================
--- jmeter/trunk/bin/mirror-server.cmd (original)
+++ jmeter/trunk/bin/mirror-server.cmd Sun Dec 23 13:51:45 2018
@@ -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.11.0.jar
-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
+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
+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
 
 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=1849624&r1=1849623&r2=1849624&view=diff
==============================================================================
--- jmeter/trunk/bin/mirror-server.sh (original)
+++ jmeter/trunk/bin/mirror-server.sh Sun Dec 23 13:51:45 2018
@@ -22,6 +22,6 @@ cd "$(dirname "$0")" || exit 1
 
 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.11.0.jar
-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
+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
 
 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=1849624&r1=1849623&r2=1849624&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Dec 23 13:51:45 2018
@@ -325,25 +325,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.sha512       = 0A703864B269DE6F7BC98DF0FA98AA943CC327A4CA2915899D460E4A071FCC3FBE70957EB91B740CC935D0960B3D98F30C54A0A4019D7AE8C6D50F51EDB8D149
 
-log4j-api.version           = 2.11.0
+log4j-api.version           = 2.11.1
 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.sha512            = 72E37483A4BD3F338885A08242005E76347D13F879937ACCCB4B3DFF3909D832BDF8B7091D4BC1E6F201A43D906D348F0FA27BFEFDDCE7D27F13E23604B7E570
+log4j-api.sha512            = A598DA3836D2DDCA60CFB3D62DF96E525A8A130CB67199C3FA0380E722B82B8F5778372CCCB763BF8AC216112C3E5E6300FC5B85E097845F42FB743ADC1FD41F
 
-log4j-core.version          = 2.11.0
+log4j-core.version          = 2.11.1
 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.sha512           = C79153BAE0743D9130C4697216C941FA5261D1CA1A7AF8D78C4EBB8CEEB28E0D3BEFEF98895042FDD31B5B9C17E5408EA60490B108618A1B83C2D146E3D816F2
+log4j-core.sha512           = 6D23ECAF0AC18A5DFF492B8F047543B392FE5D1D56EF1F9F6C68CFF43C7EE97F2FD8521C22D242E5ACBFF9C133E9315045D6C689609F9C7DA3DDFC3FFB96B261
 
-log4j-1.2-api.version       = 2.11.0
+log4j-1.2-api.version       = 2.11.1
 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.sha512        = 17DB99E9F53DAF78F3699E68CD02271B41335BE702E0356B642042D9A2848EB8EB5E40279546CDE146FCFC56EC28A67D096F4EE8720268FEC1CAEAEFB5BC1B48
+log4j-1.2-api.sha512        = 7FA86AE3F19F88C0690D12F7ACD04D270E365C1E925DF0A8012DDE7B8B3EA1F787D34C9FC26B198D7D8054F7BFADB522A34C4B8C1C7998E7C138187C5DA4060E
 
-log4j-slf4j-impl.version    = 2.11.0
+log4j-slf4j-impl.version    = 2.11.1
 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.sha512     = 4082692C66F3511183541D1ADB9E00031FCF0761A7EF84F4317C77AC314473FF1971C9B610EB97358FA8FCE147E2953B2F3E6C9EBC7B893883ED5466984C609F
+log4j-slf4j-impl.sha512     = 55360BF9BCD47DAE49FCC8E28DBAD9D3AA26BCC66729DA98D701CC2099CB070E537F19327FA52486B4E557FA513D37AFBBE6FD17B1557527FB2496F56072545A
 
 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=1849624&r1=1849623&r2=1849624&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Dec 23 13:51:45 2018
@@ -87,10 +87,10 @@
 	<classpathentry kind="lib" path="lib/jsoup-1.11.3.jar"/>
 	<classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-api-2.11.0.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-core-2.11.0.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-slf4j-impl-2.11.0.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2-api-2.11.0.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-api-2.11.1.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-core-2.11.1.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-slf4j-impl-2.11.1.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-1.2-api-2.11.1.jar"/>
 	<classpathentry kind="lib" path="lib/mail-1.5.0-b01.jar"/>
 	<classpathentry kind="lib" path="lib/mongo-java-driver-2.11.3.jar"/>
 	<classpathentry kind="lib" path="lib/oro-2.0.8.jar"/>

Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 23 13:51:45 2018
@@ -48,10 +48,10 @@ json-smart-2.3.jar
 jsoup-1.11.3.jar
 jtidy-r*.jar
 junit-4.12.jar
-log4j-1.2-api-2.11.0.jar
-log4j-api-2.11.0.jar
-log4j-core-2.11.0.jar
-log4j-slf4j-impl-2.11.0.jar
+log4j-1.2-api-2.11.1.jar
+log4j-api-2.11.1.jar
+log4j-core-2.11.1.jar
+log4j-slf4j-impl-2.11.1.jar
 mail-1.5.0-b01.jar
 mongo-java-driver-2.11.3.jar
 ph-css-6.1.1.jar

Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1849624&r1=1849623&r2=1849624&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Dec 23 13:51:45 2018
@@ -171,7 +171,7 @@ jsoup-1.11.3
 http://www.jsoup.org/
 - CSS/JQuery like extractor
 
-log4j2-2.11.0
+log4j2-2.11.1
 --------
 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=1849624&r1=1849623&r2=1849624&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Dec 23 13:51:45 2018
@@ -103,10 +103,10 @@ under the License.
       <Saxon-HE.version>9.8.0-12</Saxon-HE.version>
       <slf4j-api.version>1.7.25</slf4j-api.version>
       <slf4j-ext.version>1.7.25</slf4j-ext.version>
-      <log4j-api.version>2.11.0</log4j-api.version>
-      <log4j-core.version>2.11.0</log4j-core.version>
-      <log4j-slf4j-impl.version>2.11.0</log4j-slf4j-impl.version>
-      <log4j-1.2-api.version>2.11.0</log4j-1.2-api.version>
+      <log4j-api.version>2.11.1</log4j-api.version>
+      <log4j-core.version>2.11.1</log4j-core.version>
+      <log4j-slf4j-impl.version>2.11.1</log4j-slf4j-impl.version>
+      <log4j-1.2-api.version>2.11.1</log4j-1.2-api.version>
       <spock-core.version>1.0-groovy-2.4</spock-core.version>
       <cglib-nodep.version>3.2.9</cglib-nodep.version>
       <objenesis.version>2.6</objenesis.version>

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1849624&r1=1849623&r2=1849624&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Dec 23 13:51:45 2018
@@ -140,6 +140,7 @@ of previous time slot as a base. Startin
     <li>Updated to jsoup-1.11.3 (from 1.11.2)</li>
     <li>Updated to cglib-nodep-3.2.9 (from cglib-nodep-3.2.7)</li>
     <li>Updated to ph-commons-9.2.0 (from ph-commons-9.1.2)</li>
+    <li>Updated to log4j-2.11.1 (from log4j-2.11.0)</li>
     <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>
     <li><bug>62821</bug><pr>405</pr>Use SHA-512 checksums instead
of MD5 to verify jar downloads</li>
     <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>

Modified: jmeter/trunk/xdocs/usermanual/remote-test.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/remote-test.xml?rev=1849624&r1=1849623&r2=1849624&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/remote-test.xml (original)
+++ jmeter/trunk/xdocs/usermanual/remote-test.xml Sun Dec 23 13:51:45 2018
@@ -383,11 +383,11 @@ grant codeBase "file:${jmeter.home}/lib/
   permission java.security.AllPermission;
 };
 
-grant codeBase "file:${jmeter.home}/lib/log4j-api-2.11.0.jar" {
+grant codeBase "file:${jmeter.home}/lib/log4j-api-2.11.1.jar" {
   permission java.security.AllPermission;
 };
 
-grant codeBase "file:${jmeter.home}/lib/log4j-slf4j-impl-2.11.0.jar" {
+grant codeBase "file:${jmeter.home}/lib/log4j-slf4j-impl-2.11.1.jar" {
   permission java.security.AllPermission;
 };
 
@@ -395,7 +395,7 @@ grant codeBase "file:${jmeter.home}/lib/
   permission java.security.AllPermission;
 };
 
-grant codeBase "file:${jmeter.home}/lib/log4j-core-2.11.0.jar" {
+grant codeBase "file:${jmeter.home}/lib/log4j-core-2.11.1.jar" {
   permission java.security.AllPermission;
 };
 



Mime
View raw message