Author: pmouawad
Date: Thu Mar 3 21:35:49 2016
New Revision: 1733531
URL: http://svn.apache.org/viewvc?rev=1733531&view=rev
Log:
Bug 58715 - Feature request: Bundle groovy-all with JMeter
Bugzilla Id: 58715
Modified:
jmeter/trunk/build.properties
jmeter/trunk/build.xml
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
jmeter/trunk/lib/aareadme.txt
jmeter/trunk/licenses/bin/README.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=1733531&r1=1733530&r2=1733531&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Thu Mar 3 21:35:49 2016
@@ -159,6 +159,12 @@ freemarker.loc = ${maven2.
freemarker.jar = freemarker-${freemarker.version}.jar
freemarker.md5 = cbb1cec300ca98eea3c855cf395d4951
+# Groovy
+groovy-all.version = 2.4.6
+groovy-all.loc =
${maven2.repo}/org/codehaus/groovy/groovy-all/${groovy-all.version}
+groovy-all.jar = groovy-all-${groovy-all.version}.jar
+groovy-all.md5 = 6e5ccee6c126ae6a920f496ec8d72dc6
+
# hamcrest-core
hamcrest-core.version = 1.3
hamcrest-core.loc =
${maven2.repo}/org/hamcrest/hamcrest-core/${hamcrest-core.version}
Modified: jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1733531&r1=1733530&r2=1733531&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Thu Mar 3 21:35:49 2016
@@ -379,6 +379,7 @@
<include name="${lib.dir}/${dnsjava.jar}"/>
<include name="${lib.dir}/${excalibur-logger.jar}"/>
<include name="${lib.dir}/${freemarker.jar}"/>
+ <include name="${lib.dir}/${groovy-all.jar}"/>
<include name="${lib.dir}/${hamcrest-core.jar}"/>
<include name="${lib.dir}/${httpclient.jar}"/>
<include name="${lib.dir}/${httpcore.jar}"/>
@@ -451,6 +452,7 @@
<pathelement location="${lib.dir}/${dnsjava.jar}"/>
<pathelement location="${lib.dir}/${excalibur-logger.jar}"/>
<pathelement location="${lib.dir}/${freemarker.jar}"/>
+ <pathelement location="${lib.dir}/${groovy-all.jar}"/>
<pathelement location="${lib.dir}/${hamcrest-core.jar}"/>
<pathelement location="${lib.dir}/${httpclient.jar}"/>
<pathelement location="${lib.dir}/${httpcore.jar}"/>
@@ -527,7 +529,7 @@
<echo level="info">implementation.version =
${implementation.version}</echo>
</target>
- <!-- Get version from SVN status -->
+ <!-- Get version from SVN status -->
<target name="init-svnVersion" depends="svnCheck">
<fail message="Could not get SVN revision" unless="svn.revision"/>
<property name="jmeter.version" value="r${svn.revision}"/>
@@ -2866,6 +2868,7 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="dnsjava"/>
<process_jarfile jarname="excalibur-logger"/>
<process_jarfile jarname="freemarker"/>
+ <process_jarfile jarname="groovy-all"/>
<process_jarfile jarname="hamcrest-core"/>
<process_jarfile jarname="httpclient"/>
<process_jarfile jarname="httpcore"/>
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1733531&r1=1733530&r2=1733531&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Thu Mar 3 21:35:49 2016
@@ -62,6 +62,7 @@
<classpathentry kind="lib" path="lib/dnsjava-2.1.7.jar"/>
<classpathentry kind="lib" path="lib/excalibur-logger-1.1.jar"/>
<classpathentry kind="lib" path="lib/freemarker-2.3.23.jar"/>
+ <classpathentry kind="lib" path="lib/groovy-all-2.4.6.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.5.2.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 3 21:35:49 2016
@@ -22,6 +22,7 @@ excalibur-logger-1.1.jar
freemarker-2.3.23.jar
hamcrest-core-1.3.jar
geronimo*.jar
+groovy-all-2.4.6.jar
httpclient-4.5.2.jar
httpcore-4.4.4.jar
httpmime-4.5.2.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1733531&r1=1733530&r2=1733531&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Thu Mar 3 21:35:49 2016
@@ -95,6 +95,10 @@ excalibur-logger-1.1 (org.apache.avalon.
--------------------
- LoggingManager
+groovy-all-2.4.6
+----------------------
+Advised scripting language for JSR223 Test Elements
+
hamcrest-core-1.3
----------------------
- unit tests, JUnit sampler
Modified: jmeter/trunk/licenses/bin/README.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/README.txt?rev=1733531&r1=1733530&r2=1733531&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/README.txt (original)
+++ jmeter/trunk/licenses/bin/README.txt Thu Mar 3 21:35:49 2016
@@ -20,6 +20,7 @@ commons-net-3.4.jar
commons-pool2-2.4.2.jar
excalibur-logger-1.1.jar
geronimo-jms_1.1_spec-1.1.1.jar
+groovy-all-2.4.6.jar
httpclient-4.5.2.jar
httpcore-4.4.4.jar
httpmime-4.5.2.jar
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1733531&r1=1733530&r2=1733531&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Thu Mar 3 21:35:49 2016
@@ -74,6 +74,7 @@ under the License.
<dnsjava.version>2.1.7</dnsjava.version>
<excalibur-logger.version>1.1</excalibur-logger.version>
<freemarker.version>2.3.23</freemarker.version>
+ <groovy-all.version>2.4.6</groovy-all.version>
<hamcrest-core.version>1.3</hamcrest-core.version>
<httpclient.version>4.5.2</httpclient.version>
<httpcore.version>4.4.4</httpcore.version>
@@ -215,6 +216,11 @@ under the License.
<version>${excalibur-logger.version}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${groovy-all.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1733531&r1=1733530&r2=1733531&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Thu Mar 3 21:35:49 2016
@@ -239,6 +239,7 @@ Summary
<li><bug>59094</bug> - Drop support of old JMX file format</li>
<li><bug>59082</bug>Remove the "TestCompiler.useStaticSet" parameter.
Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>59093</bug>Option parsing error message can be 'lost'</li>
+<li><bug>58715</bug>Feature request: Bundle groovy-all with JMeter</li>
</ul>
<ch_section>Non-functional changes</ch_section>
<ul>
