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 22:56:17 UTC
svn commit: r1662826 - in /jmeter/trunk: build.properties eclipse.classpath
lib/ lib/aareadme.txt licenses/bin/junit-4.11.txt
licenses/bin/junit-4.12.txt res/maven/ApacheJMeter_parent.pom
xdocs/changes.xml
Author: pmouawad
Date: Fri Feb 27 21:56:16 2015
New Revision: 1662826
URL: http://svn.apache.org/r1662826
Log:
Update junit-4.12 from 4.11
Added:
jmeter/trunk/licenses/bin/junit-4.12.txt (contents, props changed)
- copied, changed from r1656228, jmeter/trunk/licenses/bin/junit-4.11.txt
Removed:
jmeter/trunk/licenses/bin/junit-4.11.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=1662826&r1=1662825&r2=1662826&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Fri Feb 27 21:56:16 2015
@@ -239,10 +239,10 @@ jsoup.jar = jsoup-${js
jsoup.loc = ${maven2.repo}/org/jsoup/jsoup/${jsoup.version}
jsoup.md5 = 3e473766c65d0f19bfeceaf810ef2f07
-junit.version = 4.11
+junit.version = 4.12
junit.jar = junit-${junit.version}.jar
junit.loc = ${maven2.repo}/junit/junit/${junit.version}
-junit.md5 = 3c42be5ea7cbf3635716abbb429cb90d
+junit.md5 = 5b38c40c97fbd0adee29f91e60405584
logkit.version = 2.0
logkit.jar = logkit-${logkit.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1662826&r1=1662825&r2=1662826&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Fri Feb 27 21:56:16 2015
@@ -77,7 +77,7 @@
<classpathentry kind="lib" path="lib/jodd-log-3.6.4.jar"/>
<classpathentry kind="lib" path="lib/jsoup-1.8.1.jar"/>
<classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
- <classpathentry kind="lib" path="lib/junit-4.11.jar"/>
+ <classpathentry kind="lib" path="lib/junit-4.12.jar"/>
<classpathentry kind="lib" path="lib/logkit-2.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"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 27 21:56:16 2015
@@ -37,7 +37,7 @@ jodd-log-3.6.4.jar
jorphan.jar
jsoup-1.8.1.jar
jtidy-r*.jar
-junit-4.11.jar
+junit-4.12.jar
logkit-2.0.jar
mail-1.5.0-b01.jar
mongo-java-driver-2.11.3.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1662826&r1=1662825&r2=1662826&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Fri Feb 27 21:56:16 2015
@@ -156,7 +156,7 @@ jTidy-r938
- org.xml.sax - various
- XPathUtil (XPath assertion)
-junit 4.11
+junit 4.12
-----------
- unit tests, JUnit sampler
Copied: jmeter/trunk/licenses/bin/junit-4.12.txt (from r1656228, jmeter/trunk/licenses/bin/junit-4.11.txt)
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/junit-4.12.txt?p2=jmeter/trunk/licenses/bin/junit-4.12.txt&p1=jmeter/trunk/licenses/bin/junit-4.11.txt&r1=1656228&r2=1662826&rev=1662826&view=diff
==============================================================================
(empty)
Propchange: jmeter/trunk/licenses/bin/junit-4.12.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=1662826&r1=1662825&r2=1662826&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Fri Feb 27 21:56:16 2015
@@ -88,7 +88,7 @@ under the License.
<jodd-log.version>3.6.4</jodd-log.version>
<jsoup.version>1.8.1</jsoup.version>
<rhino.version>1.7R4</rhino.version>
- <junit.version>4.11</junit.version>
+ <junit.version>4.12</junit.version>
<logkit.version>2.0</logkit.version>
<mongo-java-driver.version>2.11.3</mongo-java-driver.version>
<rsyntaxtextarea.version>2.5.3</rsyntaxtextarea.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1662826&r1=1662825&r2=1662826&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Feb 27 21:56:16 2015
@@ -132,6 +132,7 @@ Summary
<li>Updated to commons-codec-1.10.jar (from 1.9)</li>
<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><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>