Merge branch 'master' of git://github.com/tsundberg/cucumber-jvm

Author: aslakhellesoy

examples/java-wicket/java-wicket-test/pom.xml

@@ -12,7 +12,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.12.4</version>
+                <version>2.14</version>
                 <executions>
                     <execution>
                         <id>integration-test</id>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
-            <version>2.26.0</version>
+            <version>2.31.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

examples/java-wicket/pom.xml

@@ -1,17 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <!--
-    <parent>
-        <groupId>info.cukes</groupId>
-        <artifactId>cucumber-jvm</artifactId>
-        <relativePath>../../pom.xml</relativePath>
-        <version>1.1.2-SNAPSHOT</version>
-    </parent>
-    -->
     <groupId>info.cukes</groupId>
     <artifactId>java-wicket-selenium</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Examples: A Wicket application tested with Selenium WebDriver</name>
     <modules>
@@ -23,17 +15,17 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.10</version>
+                <version>4.11</version>
             </dependency>
             <dependency>
                 <groupId>info.cukes</groupId>
                 <artifactId>cucumber-java</artifactId>
-                <version>1.1.1</version>
+                <version>1.1.3</version>
             </dependency>
             <dependency>
                 <groupId>info.cukes</groupId>
                 <artifactId>cucumber-junit</artifactId>
-                <version>1.1.1</version>
+                <version>1.1.3</version>
             </dependency>
         </dependencies>
     </dependencyManagement>