Am 14. Januar 2016 15:09:05 MEZ, schrieb [email protected]: >Author: pmouawad >Date: Thu Jan 14 14:09:05 2016 >New Revision: 1724617 > >URL: http://svn.apache.org/viewvc?rev=1724617&view=rev >Log: >Bug 58851 - Add a dependency to hamcrest-core to allow JUnit tests with >annotations to work >Bugzilla Id: 58851
I think you missed committing build.properties, as hamcrest.loc and hamcrest.jar seem to be undefined in ant. There are a few tabs hidden in this commit, too. Regards, Felix > >Added: > jmeter/trunk/licenses/bin/hamcrest-core-1.3.txt (with props) >Modified: > jmeter/trunk/build.xml > 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.xml >URL: >http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1724617&r1=1724616&r2=1724617&view=diff >============================================================================== >--- jmeter/trunk/build.xml (original) >+++ jmeter/trunk/build.xml Thu Jan 14 14:09:05 2016 >@@ -378,6 +378,7 @@ > <include name="${lib.dir}/${dnsjava.jar}"/> > <include name="${lib.dir}/${excalibur-logger.jar}"/> > <include name="${lib.dir}/${freemarker.jar}"/> >+ <include name="${lib.dir}/${hamcrest-core.jar}"/> > <include name="${lib.dir}/${htmllexer.jar}"/> > <include name="${lib.dir}/${htmlparser.jar}"/> > <include name="${lib.dir}/${httpclient.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}/${hamcrest-core.jar}"/> > <pathelement location="${lib.dir}/${htmllexer.jar}"/> > <pathelement location="${lib.dir}/${htmlparser.jar}"/> > <pathelement location="${lib.dir}/${httpclient.jar}"/> >@@ -2848,7 +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="htmllexer"/> >+ <process_jarfile jarname="hamcrest-core"/> >+ <process_jarfile jarname="htmllexer"/> > <process_jarfile jarname="htmlparser"/> > <process_jarfile jarname="httpclient"/> > <process_jarfile jarname="httpcore"/> > >Modified: jmeter/trunk/eclipse.classpath >URL: >http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1724617&r1=1724616&r2=1724617&view=diff >============================================================================== >--- jmeter/trunk/eclipse.classpath (original) >+++ jmeter/trunk/eclipse.classpath Thu Jan 14 14:09:05 2016 >@@ -61,6 +61,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/hamcrest-core-1.3.jar"/> > <classpathentry kind="lib" >path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/> > <classpathentry kind="lib" path="lib/htmllexer-2.1.jar"/> > <classpathentry kind="lib" path="lib/htmlparser-2.1.jar"/> > >Propchange: jmeter/trunk/lib/ >------------------------------------------------------------------------------ >--- svn:ignore (original) >+++ svn:ignore Thu Jan 14 14:09:05 2016 >@@ -19,6 +19,7 @@ commons-pool2-2.4.2.jar > dnsjava-2.1.7.jar > excalibur-logger-1.1.jar > freemarker-2.3.23.jar >+hamcrest-core-1.3.jar > geronimo*.jar > htmllexer-2.1.jar > htmlparser-2.1.jar > >Modified: jmeter/trunk/lib/aareadme.txt >URL: >http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1724617&r1=1724616&r2=1724617&view=diff >============================================================================== >--- jmeter/trunk/lib/aareadme.txt (original) >+++ jmeter/trunk/lib/aareadme.txt Thu Jan 14 14:09:05 2016 >@@ -95,6 +95,11 @@ excalibur-logger-1.1 (org.apache.avalon. > -------------------- > - LoggingManager > >+hamcrest-core-1.3 >+---------------------- >+- unit tests, JUnit sampler >+https://github.com/hamcrest/JavaHamcrest >+ > freemarker-2.3.23.jar > ---------------------- > - used by Report/Dashboard feature > >Added: jmeter/trunk/licenses/bin/hamcrest-core-1.3.txt >URL: >http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/hamcrest-core-1.3.txt?rev=1724617&view=auto >============================================================================== >--- jmeter/trunk/licenses/bin/hamcrest-core-1.3.txt (added) >+++ jmeter/trunk/licenses/bin/hamcrest-core-1.3.txt Thu Jan 14 14:09:05 >2016 >@@ -0,0 +1,27 @@ >+BSD License >+ >+Copyright (c) 2000-2015 www.hamcrest.org >+All rights reserved. >+ >+Redistribution and use in source and binary forms, with or without >+modification, are permitted provided that the following conditions are >met: >+ >+Redistributions of source code must retain the above copyright notice, >this list of >+conditions and the following disclaimer. Redistributions in binary >form must reproduce >+the above copyright notice, this list of conditions and the following >disclaimer in >+the documentation and/or other materials provided with the >distribution. >+ >+Neither the name of Hamcrest nor the names of its contributors may be >used to endorse >+or promote products derived from this software without specific prior >written >+permission. >+ >+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS >"AS IS" AND ANY >+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE >IMPLIED WARRANTIES >+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE >DISCLAIMED. IN NO EVENT >+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, >INDIRECT, >+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, >BUT NOT LIMITED >+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR >PROFITS; OR >+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, >WHETHER IN >+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR >OTHERWISE) ARISING IN ANY >+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE >POSSIBILITY OF SUCH >+DAMAGE. >\ No newline at end of file > >Propchange: jmeter/trunk/licenses/bin/hamcrest-core-1.3.txt >------------------------------------------------------------------------------ > svn:mime-type = text/plain > >Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom >URL: >http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1724617&r1=1724616&r2=1724617&view=diff >============================================================================== >--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original) >+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Thu Jan 14 14:09:05 >2016 >@@ -73,6 +73,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> >+ <hamcrest-core.version>1.3</hamcrest-core.version> > <htmlparser.version>2.1</htmlparser.version> > <httpclient.version>4.5.1</httpclient.version> > <httpcore.version>4.4.4</httpcore.version> >@@ -391,7 +392,11 @@ under the License. > <artifactId>freemarker</artifactId> > <version>${freemarker.version}</version> > </dependency> >- >+ <dependency> >+ <groupId>org.hamcrest</groupId> >+ <artifactId>hamcrest-core</artifactId> >+ <version>${hamcrest-core.version}</version> >+ </dependency> > <!-- Docs only; not needed for source or binary archives > <dependency> > <groupId>org.apache.velocity</groupId> > >Modified: jmeter/trunk/xdocs/changes.xml >URL: >http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1724617&r1=1724616&r2=1724617&view=diff >============================================================================== >--- jmeter/trunk/xdocs/changes.xml (original) >+++ jmeter/trunk/xdocs/changes.xml Thu Jan 14 14:09:05 2016 >@@ -226,6 +226,7 @@ Summary ><li><bug>58013</bug>Enable all protocols that are enabled on the >default SSLContext for usage with the SMTP Sampler.</li> ><li><bug>58209</bug>JMeter hang when testing javasampler because >HashMap.put() is called from multiple threads without sync.</li> ><li><bug>58301</bug>Use typed methods such as setInt, setDouble, >setDate ... for prepared statement #27</li> >+ <li><bug>58851</bug>Add a dependency to hamcrest-core to allow >JUnit tests with annotations to work</li> > </ul> > > <h3>Controllers</h3>
