Author: fschumacher
Date: Sun Jul 15 13:51:28 2018
New Revision: 1835976
URL: http://svn.apache.org/viewvc?rev=1835976&view=rev
Log:
Updated to log4j-2.11.0 (from log4j-2.10.0)
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/build.properties
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
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=1835976&r1=1835975&r2=1835976&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Jul 15 13:51:28 2018
@@ -231,10 +231,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.10.0.jar
-* log4j-api-2.10.0.jar
-* log4j-core-2.10.0.jar
-* log4j-slf4j-impl-2.10.0.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
* serializer-2.7.2.jar
* startbootstrap-sb-admin-2-1.0.7
* tika-core-1.18.jar
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1835976&r1=1835975&r2=1835976&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Jul 15 13:51:28 2018
@@ -320,25 +320,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.10.0
+log4j-api.version = 2.11.0
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 = b15b1def49daaf7e74fffcce9442ba98
+log4j-api.md5 = a581600f3010fcbf0d9b3d4907142395
-log4j-core.version = 2.10.0
+log4j-core.version = 2.11.0
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 = dc99011f047e63dcc741b5ab68d116db
+log4j-core.md5 = 2abec2ce665e0d529a3f28fffbbb2dd3
-log4j-1.2-api.version = 2.10.0
+log4j-1.2-api.version = 2.11.0
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 = 962a3d75e02357133734e64f0a6538b5
+log4j-1.2-api.md5 = fb3b054b376fc7dce4dd9fef9f26cefa
-log4j-slf4j-impl.version = 2.10.0
+log4j-slf4j-impl.version = 2.11.0
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 = ddeafec01672f550eb2a0b7f30c03c5a
+log4j-slf4j-impl.md5 = 137b44346128f7e78fefcb7d16cc5981
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=1835976&r1=1835975&r2=1835976&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Jul 15 13:51:28 2018
@@ -86,10 +86,10 @@
<classpathentry kind="lib" path="lib/jsoup-1.11.2.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.10.0.jar"/>
- <classpathentry kind="lib" path="lib/log4j-core-2.10.0.jar"/>
- <classpathentry kind="lib" path="lib/log4j-slf4j-impl-2.10.0.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2-api-2.10.0.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/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 Jul 15 13:51:28 2018
@@ -48,10 +48,10 @@ json-smart-2.3.jar
jsoup-1.11.2.jar
jtidy-r*.jar
junit-4.12.jar
-log4j-1.2-api-2.10.0.jar
-log4j-api-2.10.0.jar
-log4j-core-2.10.0.jar
-log4j-slf4j-impl-2.10.0.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
mail-1.5.0-b01.jar
mongo-java-driver-2.11.3.jar
ph-css-6.0.0.jar
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1835976&r1=1835975&r2=1835976&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Jul 15 13:51:28 2018
@@ -102,10 +102,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.10.0</log4j-api.version>
- <log4j-core.version>2.10.0</log4j-core.version>
- <log4j-slf4j-impl.version>2.10.0</log4j-slf4j-impl.version>
- <log4j-1.2-api.version>2.10.0</log4j-1.2-api.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>
<spock-core.version>1.0-groovy-2.4</spock-core.version>
<cglib-nodep.version>3.2.7</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=1835976&r1=1835975&r2=1835976&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Jul 15 13:51:28 2018
@@ -180,6 +180,7 @@ this behaviour, set <code>httpclient.res
<li>Updated to jodd-lagarto-5.0.3 (from jodd-lagarto-4.1.4)</li>
<li>Updated to jodd-log-5.0.3 (from jodd-log-4.1.4)</li>
<li>Updated to jodd-props-5.0.3 (from jodd-props-4.1.4)</li>
+ <li>Updated to log4j-2.11.0 (from log4j-2.10.0)</li>
</ul>
<!-- =================== Bug fixes =================== -->
|