commit aefea9653249cdc79eace45ed224c23dd268e921
Merge: 971fe02 4cd7da1
Author: Paul Hammant <p...@hammant.org>
AuthorDate: Mon Apr 2 15:58:41 2012 -0500
Commit: Paul Hammant <p...@hammant.org>
CommitDate: Mon Apr 2 15:58:41 2012 -0500
merge from master
diff --cc pom.xml
index 49d3a4b,a36e8d5..d26b86c
--- a/pom.xml
+++ b/pom.xml
@@@ -10,11 -10,10 +10,11 @@@
<name>JBehave Tutorial using Etsy.com</name>
<properties>
- <jbehave.core.version>3.6</jbehave.core.version>
- <jbehave.navigator.version>3.6</jbehave.navigator.version>
- <jbehave.web.version>3.5</jbehave.web.version>
+ <jbehave.core.version>3.7-SNAPSHOT</jbehave.core.version>
++ <jbehave.navigator.version>3.7-SNAPSHOT</jbehave.navigator.version>
+ <jbehave.web.version>3.6-SNAPSHOT</jbehave.web.version>
<jbehave.site.version>3.1.1</jbehave.site.version>
- <fluent.selenium.version>1.3</fluent.selenium.version>
+ <fluent.selenium.version>1.5.1</fluent.selenium.version>
<selenium.version>2.20.0</selenium.version>
</properties>
@@@ -94,7 -93,6 +94,7 @@@
<id>stable</id>
<properties>
<jbehave.core.version>3.6</jbehave.core.version>
- <jbehave.navigator.version>3.6</jbehave.navigator.version>
++ <jbehave.navigator.version>3.6</jbehave.navigator.version>
<jbehave.web.version>3.5</jbehave.web.version>
</properties>
</profile>
Changed files:
M etsy-stories-groovy-pico/pom.xml
M etsy-stories-java-spring/pom.xml
M
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/AdvancedSearch.java
M
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/Buy.java
M
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/CartContents.java
M
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/Home.java
M
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/PageFactory.java
M
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/SearchResults.java
M
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/Site.java
M
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/Treasury.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentAdvancedSearch.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentBuy.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentCartContents.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentHome.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentPage.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentSearchResults.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentSite.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/fluent/FluentTreasury.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/vanilla/VanillaAdvancedSearch.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/vanilla/VanillaBuy.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/vanilla/VanillaCartContents.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/vanilla/VanillaHome.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/vanilla/VanillaPage.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/vanilla/VanillaSearchResults.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/vanilla/VanillaSite.java
D
etsy-stories-java-spring/src/main/java/org/jbehave/tutorials/etsy/pages/vanilla/VanillaTreasury.java
M pom.xml
