[jbehave-scm] [scm-core][1] JBEHAVE-740: decouple hamcrest

[Paul Hammant]

commit 553cdb8b8161925f911daf1ebbe230621209da3b
Merge: b12dd54 0b28e9d
Author:     Paul Hammant <p...@hammant.org>
AuthorDate: Tue Mar 13 07:15:27 2012 -0500
Commit:     Paul Hammant <p...@hammant.org>
CommitDate: Tue Mar 13 07:20:53 2012 -0500

    JBEHAVE-740: decouple hamcrest

diff --cc jbehave-scala/pom.xml
index b200ce1,b200ce1..69477f9
--- a/jbehave-scala/pom.xml
+++ b/jbehave-scala/pom.xml
@@@ -17,6 -17,6 +17,24 @@@
        <version>${project.version}</version>
      </dependency>
      <dependency>
++      <groupId>junit</groupId>
++      <artifactId>junit-dep</artifactId>
++      <version>4.8.2</version>
++      <exclusions>
++        <exclusion>
++          <groupId>org.hamcrest</groupId>
++          <artifactId>hamcrest-core</artifactId>
++        </exclusion>
++      </exclusions>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
++      <groupId>org.hamcrest</groupId>
++      <artifactId>hamcrest-all</artifactId>
++      <version>1.1</version>
++      <scope>test</scope>
++    </dependency>
++    <dependency>
        <groupId>org.scala-lang</groupId>
        <artifactId>scala-library</artifactId>
        <version>2.9.1</version>
Changed files:

A       
jbehave-core/src/test/java/org/jbehave/core/io/LoadFromRelativeFileTest.java
A       jbehave-core/src/test/resources/test+dir/dummy.story
M       jbehave-core/src/main/java/org/jbehave/core/io/CodeLocations.java
M       jbehave-core/src/main/java/org/jbehave/core/io/LoadFromRelativeFile.java
M       jbehave-core/src/main/java/org/jbehave/core/io/StoryFinder.java
M       
jbehave-core/src/main/java/org/jbehave/core/reporters/FilePrintStreamFactory.java
M       
jbehave-core/src/test/java/org/jbehave/core/io/CodeLocationsBehaviour.java