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/02/27 23:20:41 UTC
svn commit: r1662835 - in /jmeter/trunk: build.properties eclipse.classpath
lib/ lib/aareadme.txt licenses/bin/slf4j-api-1.7.10.txt
licenses/bin/slf4j-api-1.7.5.txt res/maven/ApacheJMeter_parent.pom
xdocs/changes.xml
Author: pmouawad
Date: Fri Feb 27 22:20:41 2015
New Revision: 1662835
URL: http://svn.apache.org/r1662835
Log:
Update slf4j 1.7.10 from 1.7.5
Added:
jmeter/trunk/licenses/bin/slf4j-api-1.7.10.txt (contents, props changed)
- copied, changed from r1656228, jmeter/trunk/licenses/bin/slf4j-api-1.7.5.txt
Removed:
jmeter/trunk/licenses/bin/slf4j-api-1.7.5.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=1662835&r1=1662834&r2=1662835&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Fri Feb 27 22:20:41 2015
@@ -259,16 +259,16 @@ rsyntaxtextarea.jar = rsyntaxtex
rsyntaxtextarea.loc = ${maven2.repo}/com/fifesoft/rsyntaxtextarea/${rsyntaxtextarea.version}
rsyntaxtextarea.md5 = 064450da76e07f5a496dfded67577bdb
-slf4j-api.version = 1.7.5
+slf4j-api.version = 1.7.10
slf4j-api.jar = slf4j-api-${slf4j-api.version}.jar
slf4j-api.loc = ${maven2.repo}/org/slf4j/slf4j-api/${slf4j-api.version}
-slf4j-api.md5 = 3b1ececad9ebc3fbad2953ccf4a070ca
+slf4j-api.md5 = 3459bdfbe4a9abed1b5b32d2e0c520ee
# Implementation to be used (currently NOP)
-slf4j-nop.version = 1.7.5
+slf4j-nop.version = 1.7.10
slf4j-nop.jar = slf4j-nop-${slf4j-nop.version}.jar
slf4j-nop.loc = ${maven2.repo}/org/slf4j/slf4j-nop/${slf4j-nop.version}
-slf4j-nop.md5 = 8f40e93b99620d0bdd628c23e55de8a4
+slf4j-nop.md5 = bceaa218daa8d06d7ed151daadc5be78
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=1662835&r1=1662834&r2=1662835&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Fri Feb 27 22:20:41 2015
@@ -85,8 +85,8 @@
<classpathentry kind="lib" path="lib/rhino-1.7R5.jar"/>
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.6.jar"/>
<classpathentry kind="lib" path="lib/serializer-2.7.2.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-nop-1.7.5.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-api-1.7.10.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-nop-1.7.10.jar"/>
<classpathentry kind="lib" path="lib/soap-2.3.1.jar"/>
<classpathentry kind="lib" path="lib/tika-core-1.7.jar"/>
<classpathentry kind="lib" path="lib/tika-parsers-1.7.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 27 22:20:41 2015
@@ -45,8 +45,8 @@ rsyntaxtextarea-2.5.6.jar
oro-2.0.8.jar
rhino-1.7R5.jar
serializer-2.7.2.jar
-slf4j-api-1.7.5.jar
-slf4j-nop-1.7.5.jar
+slf4j-api-1.7.10.jar
+slf4j-nop-1.7.10.jar
soap-2.3.1.jar
tika-core-1.7.jar
tika-parsers-1.7.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1662835&r1=1662834&r2=1662835&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Fri Feb 27 22:20:41 2015
@@ -192,7 +192,7 @@ serialiser-2.7.1
http://www.apache.org/dyn/closer.cgi/xml/xalan-j
- xalan
-slf4j-api-1.7.5, slf4j-nop-1.7.5
+slf4j-api-1.7.10, slf4j-nop-1.7.10
----------------
http://www.slf4j.org/
- jodd-core
Copied: jmeter/trunk/licenses/bin/slf4j-api-1.7.10.txt (from r1656228, jmeter/trunk/licenses/bin/slf4j-api-1.7.5.txt)
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/slf4j-api-1.7.10.txt?p2=jmeter/trunk/licenses/bin/slf4j-api-1.7.10.txt&p1=jmeter/trunk/licenses/bin/slf4j-api-1.7.5.txt&r1=1656228&r2=1662835&rev=1662835&view=diff
==============================================================================
(empty)
Propchange: jmeter/trunk/licenses/bin/slf4j-api-1.7.10.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=1662835&r1=1662834&r2=1662835&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Fri Feb 27 22:20:41 2015
@@ -92,8 +92,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.6</rsyntaxtextarea.version>
- <slf4j-api.version>1.7.5</slf4j-api.version>
- <slf4j-nop.version>1.7.5</slf4j-nop.version>
+ <slf4j-api.version>1.7.10</slf4j-api.version>
+ <slf4j-nop.version>1.7.10</slf4j-nop.version>
<soap.version>2.3.1</soap.version>
<jtidy.version>r938</jtidy.version>
<tika-core.version>1.7</tika-core.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1662835&r1=1662834&r2=1662835&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Feb 27 22:20:41 2015
@@ -133,8 +133,9 @@ Summary
<li>Updated to dnsjava-2.1.7.jar (from 2.1.6)</li>
<li>Updated to jodd-3.6.4.jar (from 3.6.1)</li>
<li>Updated to junit-4.12.jar (from 4.11)</li>
-<li>Updated to rhino-1.7R5 (from rhino-1.7R4)</li>
-<li>Updated to rsyntaxtextarea-2.5.6 (from rsyntaxtextarea-2.5.3)</li>
+<li>Updated to rhino-1.7R5 (from 1.7R4)</li>
+<li>Updated to rsyntaxtextarea-2.5.6 (from 2.5.3)</li>
+<li>Updated to slf4j-1.7.10 (from 1.7.5)</li>
<li><bug>57276</bug>RMIC no longer needed since Java 5</li>
<li><bug>57310</bug>Replace System.getProperty("file.separator") with File.separator throughout (Also "path.separator" with File.pathSeparator)</li>
<li><bug>57389</bug>Fix potential NPE in converters</li>