[jbehave-scm] [scm-web][2] update deps and make some optional

[Paul Hammant]

commit 9845e4a38efd0297d8ad0f88715bb7b18ac445bb
Author:     Paul Hammant <p...@hammant.org>
AuthorDate: Mon Mar 12 21:06:46 2012 -0500
Commit:     Paul Hammant <p...@hammant.org>
CommitDate: Mon Mar 12 21:06:46 2012 -0500

    update deps and make some optional

diff --git a/pom.xml b/pom.xml
index 1f68a06..0bea782 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   </modules>
 
   <properties>
-    <jbehave.core.version>3.6-beta-3</jbehave.core.version>
+    <jbehave.core.version>3.6-SNAPSHOT</jbehave.core.version>
     <jbehave.site.version>3.1.1</jbehave.site.version>
     <jbehave.webapp.name>jbehave-web-runner</jbehave.webapp.name>
     <jdk.version>1.5</jdk.version>
diff --git a/web-selenium/pom.xml b/web-selenium/pom.xml
index 41fdccb..01d94e2 100644
--- a/web-selenium/pom.xml
+++ b/web-selenium/pom.xml
@@ -20,6 +20,12 @@
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-java</artifactId>
       <version>${selenium.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest-all</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.seleniumhq.selenium.fluent</groupId>
@@ -31,7 +37,29 @@
           <groupId>org.seleniumhq.selenium</groupId>
           <artifactId>selenium-java</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </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>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -64,6 +92,12 @@
       <optional>true</optional>
     </dependency>
     <dependency>
+      <groupId>org.freemarker</groupId>
+      <artifactId>freemarker</artifactId>
+      <version>2.3.16</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
       <groupId>org.picocontainer</groupId>
       <artifactId>picocontainer</artifactId>
       <version>2.14.1</version>