Author: pmouawad
Date: Sun Mar 26 16:20:49 2017
New Revision: 1788740
URL: http://svn.apache.org/viewvc?rev=1788740&view=rev
Log:
Upgrade to slf4j 1.7.25 from 1.7.24
Modified:
jmeter/trunk/LICENSE
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=1788740&r1=1788739&r2=1788740&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Mar 26 16:20:49 2017
@@ -261,7 +261,7 @@ For details, please see the files under:
* hamcrest-core-1.3.jar (BSD)
* javamail-1.5.0-b01.jar (CDDL Version 1.0)
* jcharts-0.7.5.jar (?)
-* jcl-over-slf4j-1.7.24.jar (MIT)
+* jcl-over-slf4j-1.7.25.jar (MIT)
* jsoup-1.10.2.jar (MIT)
* jodd-core-3.8.1.jar (Simplified BSD)
* jodd-lagarto-3.8.1.jar (Simplified BSD)
@@ -271,8 +271,8 @@ For details, please see the files under:
* junit-4.12.jar (BSD)
* rhino-1.7.7.1.jar (MPL 2.0)
* rsyntaxtextarea-2.6.1.jar (BSD)
-* slf4j-api-1.7.24.jar (MIT)
-* slf4j-ext-1.7.24.jar (MIT)
+* slf4j-api-1.7.25.jar (MIT)
+* slf4j-ext-1.7.25.jar (MIT)
* xmlpull-1.1.3.1.jar (Public Domain)
* xpp3-1.1.4c.jar (Indiana University Extreme! Lab Software License 1.1.1)
* xstream-1.4.9.jar (BSD)
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1788740&r1=1788739&r2=1788740&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Mar 26 16:20:49 2017
@@ -265,20 +265,20 @@ rsyntaxtextarea.jar = rsyntaxtex
rsyntaxtextarea.loc =
${maven2.repo}/com/fifesoft/rsyntaxtextarea/${rsyntaxtextarea.version}
rsyntaxtextarea.md5 = cf5a26609efa7e834df891e54abf0634
-slf4j-api.version = 1.7.24
+slf4j-api.version = 1.7.25
slf4j-api.jar = slf4j-api-${slf4j-api.version}.jar
slf4j-api.loc =
${maven2.repo}/org/slf4j/slf4j-api/${slf4j-api.version}
-slf4j-api.md5 = d18638036e314cdd66f04e2d248b7df9
+slf4j-api.md5 = caafe376afb7086dcbee79f780394ca3
-slf4j-ext.version = 1.7.24
+slf4j-ext.version = 1.7.25
slf4j-ext.jar = slf4j-ext-${slf4j-ext.version}.jar
slf4j-ext.loc =
${maven2.repo}/org/slf4j/slf4j-ext/${slf4j-ext.version}
-slf4j-ext.md5 = 16d4a600732f4eca1966708e3e599238
+slf4j-ext.md5 = e85f2c9a7adfaedbbbe97fab4a7c1d4e
-jcl-over-slf4j.version = 1.7.24
+jcl-over-slf4j.version = 1.7.25
jcl-over-slf4j.jar = jcl-over-slf4j-${jcl-over-slf4j.version}.jar
jcl-over-slf4j.loc =
${maven2.repo}/org/slf4j/jcl-over-slf4j/${jcl-over-slf4j.version}
-jcl-over-slf4j.md5 = c4f92652e13f3095fc95fcdcb5b514d7
+jcl-over-slf4j.md5 = 56b22adc639b09b2e917f42d68b26600
log4j-api.version = 2.8.1
log4j-api.jar = log4j-api-${log4j-api.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1788740&r1=1788739&r2=1788740&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Mar 26 16:20:49 2017
@@ -71,7 +71,7 @@
<classpathentry kind="lib" path="lib/httpcore-4.4.6.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.5.3.jar"/>
<classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
- <classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.24.jar"/>
+ <classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.25.jar"/>
<classpathentry kind="lib" path="lib/jodd-core-3.8.1.jar"/>
<classpathentry kind="lib" path="lib/jodd-lagarto-3.8.1.jar"/>
<classpathentry kind="lib" path="lib/jodd-log-3.8.1.jar"/>
@@ -89,8 +89,8 @@
<classpathentry kind="lib" path="lib/rhino-1.7.7.1.jar"/>
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.6.1.jar"/>
<classpathentry kind="lib" path="lib/serializer-2.7.2.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-api-1.7.24.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-ext-1.7.24.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"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Mar 26 16:20:49 2017
@@ -29,7 +29,7 @@ httpcore-4.4.6.jar
httpcore-nio-4.4.6.jar
httpmime-4.5.3.jar
jcharts-0.7.5.jar
-jcl-over-slf4j-1.7.24.jar
+jcl-over-slf4j-1.7.25.jar
jms*.jar
jodd-core-3.8.1.jar
jodd-lagarto-3.8.1.jar
@@ -53,8 +53,8 @@ rsyntaxtextarea-2.6.1.jar
oro-2.0.8.jar
rhino-1.7.7.1.jar
serializer-2.7.2.jar
-slf4j-api-1.7.24.jar
-slf4j-ext-1.7.24.jar
+slf4j-api-1.7.25.jar
+slf4j-ext-1.7.25.jar
tika-core-1.14.jar
tika-parsers-1.14.jar
xalan-2.7.2.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1788740&r1=1788739&r2=1788740&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Mar 26 16:20:49 2017
@@ -210,7 +210,7 @@ serialiser-2.7.1
http://www.apache.org/dyn/closer.cgi/xml/xalan-j
- xalan
-slf4j-api-1.7.24
+slf4j-api-1.7.25
----------------
http://www.slf4j.org/
- jodd-core
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1788740&r1=1788739&r2=1788740&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Mar 26 16:20:49 2017
@@ -81,7 +81,7 @@ under the License.
<httpmime.version>4.5.3</httpmime.version>
<jakarta-oro.version>2.0.8</jakarta-oro.version>
<jcharts.version>0.7.5</jcharts.version>
- <jcl-over-slf4j.version>1.7.24</jcl-over-slf4j.version>
+ <jcl-over-slf4j.version>1.7.25</jcl-over-slf4j.version>
<jodd-core.version>3.8.1</jodd-core.version>
<jodd-lagarto.version>3.8.1</jodd-lagarto.version>
<jodd-log.version>3.8.1</jodd-log.version>
@@ -95,8 +95,8 @@ under the License.
<ph-css.version>5.0.3</ph-css.version>
<ph-commons.version>8.6.0</ph-commons.version>
<rsyntaxtextarea.version>2.6.1</rsyntaxtextarea.version>
- <slf4j-api.version>1.7.24</slf4j-api.version>
- <slf4j-ext.version>1.7.24</slf4j-ext.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>
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1788740&r1=1788739&r2=1788740&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Mar 26 16:20:49 2017
@@ -328,7 +328,7 @@ listeners hold and a rework of the way G
<li>Updated to jsoup-1.10.2 (from 1.10.1)</li>
<li>Updated to ph-css 5.0.3 (from 4.1.6)</li>
<li>Updated to ph-commons 8.6.0 (from 6.2.4)</li>
- <li>Updated to slf4j-api 1.7.24 (from 1.7.21)</li>
+ <li>Updated to slf4j-api 1.7.25 (from 1.7.21)</li>
<li>Updated to asm 5.2 (from 5.1)</li>
<li>Updated to rsyntaxtextarea-2.6.1 (from 2.6.0)</li>
<li>Updated to commons-net-3.6 (from 3.5)</li>
