You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2015/12/19 14:47:33 UTC
svn commit: r1720926 - in /jmeter/trunk: build.properties eclipse.classpath
lib/ lib/aareadme.txt licenses/bin/slf4j-api-1.7.12.txt
licenses/bin/slf4j-api-1.7.13.txt res/maven/ApacheJMeter_parent.pom
xdocs/changes.xml
Author: pmouawad
Date: Sat Dec 19 13:47:33 2015
New Revision: 1720926
URL: http://svn.apache.org/viewvc?rev=1720926&view=rev
Log:
Update to slf4j-1.7.13.jar
Added:
jmeter/trunk/licenses/bin/slf4j-api-1.7.13.txt (contents, props changed)
- copied, changed from r1718720, jmeter/trunk/licenses/bin/slf4j-api-1.7.12.txt
Removed:
jmeter/trunk/licenses/bin/slf4j-api-1.7.12.txt
Modified:
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/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1720926&r1=1720925&r2=1720926&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sat Dec 19 13:47:33 2015
@@ -280,16 +280,16 @@ rsyntaxtextarea.jar = rsyntaxtex
rsyntaxtextarea.loc = ${maven2.repo}/com/fifesoft/rsyntaxtextarea/${rsyntaxtextarea.version}
rsyntaxtextarea.md5 = cf6f067aede0f740dc553558639fa05f
-slf4j-api.version = 1.7.12
+slf4j-api.version = 1.7.13
slf4j-api.jar = slf4j-api-${slf4j-api.version}.jar
slf4j-api.loc = ${maven2.repo}/org/slf4j/slf4j-api/${slf4j-api.version}
-slf4j-api.md5 = 68910bf95dbcf90ce5859128f0f75d1e
+slf4j-api.md5 = a5168034046d95e07f4aae3f5e2d1c67
# Implementation to be used (currently NOP)
-slf4j-nop.version = 1.7.12
+slf4j-nop.version = 1.7.13
slf4j-nop.jar = slf4j-nop-${slf4j-nop.version}.jar
slf4j-nop.loc = ${maven2.repo}/org/slf4j/slf4j-nop/${slf4j-nop.version}
-slf4j-nop.md5 = 15e891fcc4cbb507d5dea38073e4a058
+slf4j-nop.md5 = c9a522693b35847f43d705b69ab283cf
soap.version = 2.3.1
soap.jar = soap-${soap.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1720926&r1=1720925&r2=1720926&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sat Dec 19 13:47:33 2015
@@ -89,8 +89,8 @@
<classpathentry kind="lib" path="lib/rhino-1.7.7.jar"/>
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.8.jar"/>
<classpathentry kind="lib" path="lib/serializer-2.7.2.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-api-1.7.12.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-nop-1.7.12.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-api-1.7.13.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-nop-1.7.13.jar"/>
<classpathentry kind="lib" path="lib/soap-2.3.1.jar"/>
<classpathentry kind="lib" path="lib/tika-core-1.11.jar"/>
<classpathentry kind="lib" path="lib/tika-parsers-1.11.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 19 13:47:33 2015
@@ -49,8 +49,8 @@ rsyntaxtextarea-2.5.8.jar
oro-2.0.8.jar
rhino-1.7.7.jar
serializer-2.7.2.jar
-slf4j-api-1.7.12.jar
-slf4j-nop-1.7.12.jar
+slf4j-api-1.7.13.jar
+slf4j-nop-1.7.13.jar
soap-2.3.1.jar
tika-core-1.11.jar
tika-parsers-1.11.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1720926&r1=1720925&r2=1720926&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sat Dec 19 13:47:33 2015
@@ -213,7 +213,7 @@ serialiser-2.7.1
http://www.apache.org/dyn/closer.cgi/xml/xalan-j
- xalan
-slf4j-api-1.7.12, slf4j-nop-1.7.12
+slf4j-api-1.7.13, slf4j-nop-1.7.13
----------------
http://www.slf4j.org/
- jodd-core
Copied: jmeter/trunk/licenses/bin/slf4j-api-1.7.13.txt (from r1718720, jmeter/trunk/licenses/bin/slf4j-api-1.7.12.txt)
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/slf4j-api-1.7.13.txt?p2=jmeter/trunk/licenses/bin/slf4j-api-1.7.13.txt&p1=jmeter/trunk/licenses/bin/slf4j-api-1.7.12.txt&r1=1718720&r2=1720926&rev=1720926&view=diff
==============================================================================
(empty)
Propchange: jmeter/trunk/licenses/bin/slf4j-api-1.7.13.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1720926&r1=1720925&r2=1720926&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sat Dec 19 13:47:33 2015
@@ -96,8 +96,8 @@ under the License.
<logkit.version>2.0</logkit.version>
<mongo-java-driver.version>2.11.3</mongo-java-driver.version>
<rsyntaxtextarea.version>2.5.8</rsyntaxtextarea.version>
- <slf4j-api.version>1.7.12</slf4j-api.version>
- <slf4j-nop.version>1.7.12</slf4j-nop.version>
+ <slf4j-api.version>1.7.13</slf4j-api.version>
+ <slf4j-nop.version>1.7.13</slf4j-nop.version>
<soap.version>2.3.1</soap.version>
<jtidy.version>r938</jtidy.version>
<tika-core.version>1.11</tika-core.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1720926&r1=1720925&r2=1720926&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sat Dec 19 13:47:33 2015
@@ -167,6 +167,7 @@ Summary
<li>Updated to xmlgraphics-commons-2.0.1 (from 1.5)</li>
<li>Updated to commons-collections-3.2.2 (from 3.2.1)</li>
<li>Updated to commons-net 3.4 (from 3.3)</li>
+<li>Updated to slf4j 1.7.13 (from 1.7.12)</li>
<li><bug>57981</bug>Require a minimum of Java 7. Partly contributed by Graham Russell (jmeter at ham1.co.uk)</li>
<li><bug>58684</bug>JMeterColor does not need to extend java.awt.Color. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>58687</bug>ButtonPanel should die. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>