jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1724634 - in /jmeter/trunk: build.properties build.xml
Date Thu, 14 Jan 2016 15:41:21 GMT
Author: pmouawad
Date: Thu Jan 14 15:41:20 2016
New Revision: 1724634

URL: http://svn.apache.org/viewvc?rev=1724634&view=rev
Log:
Bug 58851 - Add a dependency to hamcrest-core to allow JUnit tests with annotations to work
Missing update of build.properties
Tab police

Thanks Felix
Bugzilla Id: 58851

Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/build.xml

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1724634&r1=1724633&r2=1724634&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Thu Jan 14 15:41:20 2016
@@ -154,6 +154,12 @@ freemarker.loc               = ${maven2.
 freemarker.jar               = freemarker-${freemarker.version}.jar
 freemarker.md5               = cbb1cec300ca98eea3c855cf395d4951
 
+# hamcrest-core
+hamcrest-core.version        = 1.3
+hamcrest-core.loc            = ${maven2.repo}/org/hamcrest/hamcrest-core/${hamcrest-core.version}
+hamcrest-core.jar            = hamcrest-core-${hamcrest-core.version}.jar
+hamcrest-core.md5            = 6393363b47ddcbba82321110c3e07519
+
 # Common file containing both htmlparser and htmllexer jars
 htmlparser.version          = 2.1
 htmllexer.loc               = ${maven2.repo}/org/htmlparser/htmllexer/${htmlparser.version}

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1724634&r1=1724633&r2=1724634&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Thu Jan 14 15:41:20 2016
@@ -2850,8 +2850,8 @@ run JMeter unless all the JMeter jars ar
         <process_jarfile jarname="dnsjava"/>
         <process_jarfile jarname="excalibur-logger"/>
         <process_jarfile jarname="freemarker"/>
-    	<process_jarfile jarname="hamcrest-core"/>
-    	<process_jarfile jarname="htmllexer"/>
+        <process_jarfile jarname="hamcrest-core"/>
+        <process_jarfile jarname="htmllexer"/>
         <process_jarfile jarname="htmlparser"/>
         <process_jarfile jarname="httpclient"/>
         <process_jarfile jarname="httpcore"/>



Mime
View raw message