Author: pmouawad
Date: Sat Feb 23 14:50:07 2019
New Revision: 1854212
URL: http://svn.apache.org/viewvc?rev=1854212&view=rev
Log:
Updated to latest Spock-core v1.0 -> v1.2
Contributed by Graham Russell
This closes #444
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/build.properties
jmeter/trunk/eclipse.classpath
jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1854212&r1=1854211&r2=1854212&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sat Feb 23 14:50:07 2019
@@ -260,7 +260,7 @@ The following software is provided under
* objenesis-2.6.jar
* ph-commons-9.2.1.jar
* ph-css-6.1.1.jar
-* spock-core-1.0-groovy-2.4.jar
+* spock-core-1.2-groovy-2.4.jar
- Software produced outside the ASF which is available under other licenses
(not AL 2.0):
For details, please see the files under: licenses/bin
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1854212&r1=1854211&r2=1854212&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sat Feb 23 14:50:07 2019
@@ -290,10 +290,10 @@ junit.jar = junit-${ju
junit.loc = ${maven2.repo}/junit/junit/${junit.version}
junit.sha512 =
5974670C3D178A12DA5929BA5DD9B4F5FF461BDC1B92618C2C36D53E88650DF7ADBF3C1684017BB082B477CB8F40F15DCF7526F06F06183F93118BA9EBEACCCE
-spock-core.version = 1.0-groovy-2.4
+spock-core.version = 1.2-groovy-2.4
spock-core.jar = spock-core-${spock-core.version}.jar
spock-core.loc =
${maven2.repo}/org/spockframework/spock-core/${spock-core.version}
-spock-core.sha512 =
078C0B16688EAA3134043E58ED4273981797EA92F08723B5508C7D7E4F635278DD5CA731FB294DA2A1F35674623D969EE423D4344C2C822E1D4CB8D4F3383790
+spock-core.sha512 =
407aee08d0e6aa1e2adc3c9a1c966d91f2f53bee0c92b85508f1e03e99f0e669356a2fbf9f450db8d5328ad16ecd19b1be1c9023b5c00031e91b9799a30381c2
cglib-nodep.version = 3.2.9
cglib-nodep.jar = cglib-nodep-${cglib-nodep.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1854212&r1=1854211&r2=1854212&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sat Feb 23 14:50:07 2019
@@ -114,7 +114,7 @@
<classpathentry kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
<classpathentry kind="lib" path="lib/xstream-1.4.11.jar"/>
<!-- Needed for build and test -->
- <classpathentry kind="lib" path="lib/spock-core-1.0-groovy-2.4.jar"/>
+ <classpathentry kind="lib" path="lib/spock-core-1.2-groovy-2.4.jar"/>
<classpathentry kind="lib" path="lib/cglib-nodep-3.2.9.jar"/>
<classpathentry kind="lib" path="lib/objenesis-2.6.jar"/>
<classpathentry kind="lib" path="lib/api/bcmail-jdk15on-1.60.jar"/>
Modified: jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java?rev=1854212&r1=1854211&r2=1854212&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Sat Feb 23
14:50:07 2019
@@ -159,10 +159,10 @@ public class JMeterVersionTest extends J
jar=jar.replace("-jdk15on","");
} else if (jar.equals("commons-jexl") &&
version.startsWith("2")) { // special handling
jar = "commons-jexl2";
- } else if (jar.equals("spock-core-1.0-groovy")) { // special
handling
+ } else if (jar.equals("spock-core-1.2-groovy")) { // special
handling
jar = "spock-core";
- version = "1.0-groovy-2.4";
- }else {
+ version = "1.2-groovy-2.4";
+ } else {
String tmp = JAR_TO_BUILD_PROP.get(jar);
if (tmp != null) {
jar = tmp;
@@ -186,10 +186,8 @@ public class JMeterVersionTest extends J
propNames.remove(jar);
if (expected == null) {
fail("Versions list does not contain: " + jar);
- } else {
- if (!version.equals(expected)) {
- assertEquals(jar,version,expected);
- }
+ } else if (!version.equals(expected)) {
+ assertEquals(jar,version,expected);
}
}
}
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1854212&r1=1854211&r2=1854212&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Feb 23 14:50:07 2019
@@ -108,6 +108,7 @@ Summary
<h3>General</h3>
<ul>
+ <li><pr>444</pr> Update to latest Spock v1.2 (was 1.0). Contributed by
Graham Russell (graham at ham1.co.uk)</li>
</ul>
<ch_section>Non-functional changes</ch_section>
@@ -168,6 +169,7 @@ Summary
<ul>
<li><a href="https://ubikloadpack.com";>Ubik Load Pack</a></li>
<li>Benoit Vatan (benoit.vatan at gmail.com)</li>
+ <li>Graham Russell (graham at ham1.co.uk)</li>
</ul>
<p>We also thank bug reporters who helped us improve JMeter.</p>
<ul>
