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 2016/09/17 22:04:40 UTC
svn commit: r1761291 - in /jmeter/trunk: ./ lib/ licenses/bin/ res/maven/
xdocs/
Author: pmouawad
Date: Sat Sep 17 22:04:40 2016
New Revision: 1761291
URL: http://svn.apache.org/viewvc?rev=1761291&view=rev
Log:
Updated to slf4j-api-1.7.21 from 1.7.13
Added:
jmeter/trunk/licenses/bin/slf4j-api-1.7.21.txt
- copied unchanged from r1761222, jmeter/trunk/licenses/bin/slf4j-api-1.7.13.txt
Removed:
jmeter/trunk/licenses/bin/slf4j-api-1.7.13.txt
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/res/maven/ApacheJMeter_slf4j_logkit.pom
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/LICENSE
URL: http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1761291&r1=1761290&r2=1761291&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sat Sep 17 22:04:40 2016
@@ -268,7 +268,7 @@ For details, please see the files under:
* junit-4.12.jar (BSD)
* rhino-1.7.7.1.jar (MPL 2.0)
* rsyntaxtextarea-2.5.8.jar (?)
-* slf4j-api-1.7.13.jar (MIT)
+* slf4j-api-1.7.21.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.8.jar (BSD)
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1761291&r1=1761290&r2=1761291&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sat Sep 17 22:04:40 2016
@@ -279,10 +279,10 @@ rsyntaxtextarea.jar = rsyntaxtex
rsyntaxtextarea.loc = ${maven2.repo}/com/fifesoft/rsyntaxtextarea/${rsyntaxtextarea.version}
rsyntaxtextarea.md5 = cf6f067aede0f740dc553558639fa05f
-slf4j-api.version = 1.7.13
+slf4j-api.version = 1.7.21
slf4j-api.jar = slf4j-api-${slf4j-api.version}.jar
slf4j-api.loc = ${maven2.repo}/org/slf4j/slf4j-api/${slf4j-api.version}
-slf4j-api.md5 = a5168034046d95e07f4aae3f5e2d1c67
+slf4j-api.md5 = c9be56284a92dcb2576679282eff80bf
jtidy.version = r938
jtidy.jar = jtidy-${jtidy.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1761291&r1=1761290&r2=1761291&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sat Sep 17 22:04:40 2016
@@ -90,7 +90,7 @@
<classpathentry kind="lib" path="lib/rhino-1.7.7.1.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.13.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-api-1.7.21.jar"/>
<classpathentry kind="lib" path="lib/tika-core-1.13.jar"/>
<classpathentry kind="lib" path="lib/tika-parsers-1.13.jar"/>
<classpathentry kind="lib" path="lib/xalan-2.7.2.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Sep 17 22:04:40 2016
@@ -50,7 +50,7 @@ rsyntaxtextarea-2.5.8.jar
oro-2.0.8.jar
rhino-1.7.7.1.jar
serializer-2.7.2.jar
-slf4j-api-1.7.13.jar
+slf4j-api-1.7.21.jar
tika-core-1.13.jar
tika-parsers-1.13.jar
xalan-2.7.2.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1761291&r1=1761290&r2=1761291&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sat Sep 17 22:04:40 2016
@@ -221,7 +221,7 @@ serialiser-2.7.1
http://www.apache.org/dyn/closer.cgi/xml/xalan-j
- xalan
-slf4j-api-1.7.13
+slf4j-api-1.7.21
----------------
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=1761291&r1=1761290&r2=1761291&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sat Sep 17 22:04:40 2016
@@ -96,7 +96,7 @@ under the License.
<ph-css.version>4.1.5</ph-css.version>
<ph-commons.version>6.2.4</ph-commons.version>
<rsyntaxtextarea.version>2.5.8</rsyntaxtextarea.version>
- <slf4j-api.version>1.7.13</slf4j-api.version>
+ <slf4j-api.version>1.7.21</slf4j-api.version>
<jtidy.version>r938</jtidy.version>
<tika-core.version>1.13</tika-core.version>
<tika-parsers.version>1.13</tika-parsers.version>
Modified: jmeter/trunk/res/maven/ApacheJMeter_slf4j_logkit.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_slf4j_logkit.pom?rev=1761291&r1=1761290&r2=1761291&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_slf4j_logkit.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_slf4j_logkit.pom Sat Sep 17 22:04:40 2016
@@ -52,7 +52,7 @@ under the License.
<properties>
<!-- these must agree with the definitions in build.properties -->
<logkit.version>2.0</logkit.version>
- <slf4j-api.version>1.7.13</slf4j-api.version>
+ <slf4j-api.version>1.7.21</slf4j-api.version>
</properties>
<dependencies>
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1761291&r1=1761290&r2=1761291&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Sep 17 22:04:40 2016
@@ -168,6 +168,7 @@ Summary
<li>Updated to commons-net 3.5 (from 3.4)</li>
<li>Updated to groovy 2.4.7 (from 2.4.6)</li>
<li>Updated to httpcore 4.4.5 (from 4.4.4)</li>
+ <li>Updated to slf4j-api 1.7.21 (from 1.7.13)</li>
<li><pr>215</pr>Reduce duplicated code by using the newly added method <code>GuiUtils#cancelEditing</code>.
Contributed by Benoit Wiart (b.wiart at ubik-ingenierie.com)</li>
<li><pr>218</pr>Misc cleanup. Contributed by Benoit Wiart (b.wiart at ubik-ingenierie.com)</li>