Merge branch 'master' of github.com:tsundberg/cucumber-jvm into tsund…

…berg-master
cucumber · Aug 26, 2013 · c3ef5d0 · c3ef5d0
2 parents c196d46 + bf98674
commit c3ef5d0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 29 deletions.
diff --git a/examples/java-wicket/java-wicket-main/pom.xml b/examples/java-wicket/java-wicket-main/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>info.cukes</groupId>
         <artifactId>java-wicket-selenium</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>java-wicket-main</artifactId>
     <name>Examples: A Wicket application that can be tested with Selenium WebDriver</name>
@@ -16,7 +16,6 @@
         <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-core</artifactId>
-            <version>6.2.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -26,7 +25,6 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>9.0.0.M2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/examples/java-wicket/java-wicket-test/pom.xml b/examples/java-wicket/java-wicket-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>info.cukes</groupId>
         <artifactId>java-wicket-selenium</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>java-wicket-test</artifactId>
     <name>Examples: A Selenium WebDriver example testing a Wicket application</name>
@@ -13,7 +13,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.14</version>
                 <executions>
                     <execution>
                         <id>integration-test</id>
@@ -34,7 +33,6 @@
             <plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven2-plugin</artifactId>
-                <version>1.3.0</version>
                 <executions>
                     <execution>
                         <id>start-servlet-engine</id>
@@ -71,7 +69,7 @@
         <dependency>
             <groupId>info.cukes</groupId>
             <artifactId>java-wicket-main</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
+            <version>${project.version}</version>
             <type>war</type>
             <scope>test</scope>
         </dependency>
@@ -93,7 +91,6 @@
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
-            <version>2.31.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/examples/java-wicket/pom.xml b/examples/java-wicket/pom.xml
@@ -1,32 +1,17 @@
 <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>
-    <groupId>info.cukes</groupId>
+    <parent>
+        <groupId>info.cukes</groupId>
+        <artifactId>cucumber-jvm</artifactId>
+        <relativePath>../../pom.xml</relativePath>
+        <version>1.1.5-SNAPSHOT</version>
+    </parent>
     <artifactId>java-wicket-selenium</artifactId>
-    <version>1.1.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Examples: A Wicket application tested with Selenium WebDriver</name>
     <modules>
         <module>java-wicket-main</module>
         <module>java-wicket-test</module>
     </modules>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.11</version>
-            </dependency>
-            <dependency>
-                <groupId>info.cukes</groupId>
-                <artifactId>cucumber-java</artifactId>
-                <version>1.1.3</version>
-            </dependency>
-            <dependency>
-                <groupId>info.cukes</groupId>
-                <artifactId>cucumber-junit</artifactId>
-                <version>1.1.3</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -59,6 +59,8 @@
         <android-maven-plugin.version>3.6.1</android-maven-plugin.version>
         <!-- Minimum android sdk api level 8 = platform 2.2.1 -->
         <android.version>2.2.1</android.version>
+        <wicket.version>6.9.1</wicket.version>
+        <jetty.version>9.0.5.v20130815</jetty.version>
     </properties>
     <licenses>
         <license>
@@ -327,6 +329,12 @@
                 <artifactId>selenium-server</artifactId>
                 <version>${selenium.version}</version>
             </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>${selenium.version}</version>
+            <scope>test</scope>
+        </dependency>
             <dependency>
                 <groupId>org.webbitserver</groupId>
                 <artifactId>webbit</artifactId>
@@ -397,6 +405,16 @@
                 <scope>provided</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket-core</artifactId>
+                <version>${wicket.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>