jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1819021 - in /jmeter/trunk: build.properties build.xml res/maven/ApacheJMeter_parent.pom test/src/org/apache/jmeter/JMeterVersionTest.java
Date Fri, 22 Dec 2017 09:53:13 GMT
Author: fschumacher
Date: Fri Dec 22 09:53:13 2017
New Revision: 1819021

URL: http://svn.apache.org/viewvc?rev=1819021&view=rev
Log:
Now that we renamed spock to spock-core for eclipse, we had to do it
for maven, ant and the tests, too.

Follow-up to r1819017 which was a follow-up to r1816319.
Relates to #332 on github

Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/build.xml
    jmeter/trunk/res/maven/ApacheJMeter_parent.pom
    jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1819021&r1=1819020&r2=1819021&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Fri Dec 22 09:53:13 2017
@@ -260,10 +260,10 @@ junit.jar                   = junit-${ju
 junit.loc                   = ${maven2.repo}/junit/junit/${junit.version}
 junit.md5                   = 5b38c40c97fbd0adee29f91e60405584
 
-spock.version               = 1.0-groovy-2.4
-spock.jar                   = spock-core-${spock.version}.jar
-spock.loc                   = ${maven2.repo}/org/spockframework/spock-core/${spock.version}
-spock.md5                   = 2fbbeaf95dd10b445c6c581c9b945075
+spock-core.version          = 1.0-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.md5              = 2fbbeaf95dd10b445c6c581c9b945075
 
 cglib-nodep.version         = 3.2.5
 cglib-nodep.jar             = cglib-nodep-${cglib-nodep.version}.jar

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1819021&r1=1819020&r2=1819021&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Fri Dec 22 09:53:13 2017
@@ -519,7 +519,7 @@
     <pathelement location="${lib.dir}/${serializer.jar}"/>
     <pathelement location="${lib.dir}/${slf4j-api.jar}"/>
     <pathelement location="${lib.dir}/${slf4j-ext.jar}"/>
-    <pathelement location="${lib.dir}/${spock.jar}"/>
+    <pathelement location="${lib.dir}/${spock-core.jar}"/>
     <pathelement location="${lib.dir}/${cglib-nodep.jar}"/>
     <pathelement location="${lib.dir}/${objenesis.jar}"/>
     <pathelement location="${lib.dir}/${jtidy.jar}"/>
@@ -3251,7 +3251,7 @@ run JMeter unless all the JMeter jars ar
     <process_jarfile jarname="log4j-1.2-api"/>
     <process_jarfile jarname="log4j-core"/>
     <process_jarfile jarname="log4j-slf4j-impl"/>
-    <process_jarfile jarname="spock"/>
+    <process_jarfile jarname="spock-core"/>
     <process_jarfile jarname="cglib-nodep"/>
     <process_jarfile jarname="objenesis"/>
     <process_jarfile jarname="jtidy"/>

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1819021&r1=1819020&r2=1819021&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Fri Dec 22 09:53:13 2017
@@ -103,7 +103,7 @@ under the License.
       <log4j-core.version>2.8.2</log4j-core.version>
       <log4j-slf4j-impl.version>2.8.2</log4j-slf4j-impl.version>
       <log4j-1.2-api.version>2.8.2</log4j-1.2-api.version>
-      <spock.version>1.0-groovy-2.4</spock.version>
+      <spock-core.version>1.0-groovy-2.4</spock-core.version>
       <cglib-nodep.version>3.2.5</cglib-nodep.version>
       <objenesis.version>2.6</objenesis.version>
       <jtidy.version>r938</jtidy.version>
@@ -275,7 +275,7 @@ under the License.
       <dependency>
         <groupId>org.spockframework</groupId>
         <artifactId>spock-core</artifactId>
-        <version>${spock.version}</version>
+        <version>${spock-core.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>

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=1819021&r1=1819020&r2=1819021&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Fri Dec 22 09:53:13 2017
@@ -158,8 +158,8 @@ 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-1.0-groovy")) { // special handling
-                    jar = "spock";
+                } else if (jar.equals("spock-core-1.0-groovy")) { // special handling
+                    jar = "spock-core";
                     version = "1.0-groovy-2.4";
                 } else {
                     String tmp = JAR_TO_BUILD_PROP.get(jar);



Mime
View raw message