From 495f5b96f26bc1183cb0e5f5a2b3c63de27d86bb Mon Sep 17 00:00:00 2001
From: Nayan Hajratwala <nayan@chikli.com>
Date: Tue, 18 Mar 2014 13:54:44 -0400
Subject: [PATCH 1/2] Set minimum maven version to 3.0.4 and updated plugin
 versions

---
 android/pom.xml |  1 -
 clojure/pom.xml |  1 -
 pom.xml         | 40 +++++++++++++++++++++++++++++++---------
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/android/pom.xml b/android/pom.xml
index 458d79a38f..5b241cd55b 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -32,7 +32,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.9.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/clojure/pom.xml b/clojure/pom.xml
index ba75eacdbf..845a63c31f 100644
--- a/clojure/pom.xml
+++ b/clojure/pom.xml
@@ -54,7 +54,6 @@
             <plugin>
                 <groupId>com.theoryinpractise</groupId>
                 <artifactId>clojure-maven-plugin</artifactId>
-                <version>1.3.12</version>
                 <configuration>
                     <namespaces>
                         <namespace>cucumber.*</namespace>
diff --git a/pom.xml b/pom.xml
index 5d4d2379cb..c2ec93e965 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,10 @@
         <version>7</version>
     </parent>
 
+    <prerequisites>
+        <maven>3.0.4</maven>
+    </prerequisites>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -519,7 +523,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-release-plugin</artifactId>
-                        <version>2.4.1</version>
                         <configuration>
                             <tagNameFormat>v@{project.version}</tagNameFormat>
                         </configuration>
@@ -528,7 +531,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.4</version>
                         <configuration>
                             <useAgent>true</useAgent>
                         </configuration>
@@ -629,7 +631,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.4</version>
+                    <version>1.5</version>
                 </plugin>
 
                 <plugin>
@@ -674,13 +676,13 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.4.1</version>
+                    <version>2.5</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.2</version>
                     <executions>
                         <execution>
                             <phase>package</phase>
@@ -700,6 +702,12 @@
                     <version>3.3</version>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.6</version>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
@@ -717,7 +725,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.16</version>
+                    <version>2.17</version>
                     <configuration>
                         <argLine>-Duser.language=en</argLine>
                         <argLine>-Xmx1024m</argLine>
@@ -732,7 +740,7 @@
                 <plugin>
                     <groupId>net.alchim31.maven</groupId>
                     <artifactId>scala-maven-plugin</artifactId>
-                    <version>3.1.5</version>
+                    <version>${scala-maven-plugin.version}</version>
                 </plugin>
 
                 <plugin>
@@ -750,9 +758,23 @@
                 <plugin>
                     <groupId>com.theoryinpractise</groupId>
                     <artifactId>clojure-maven-plugin</artifactId>
-                    <version>1.3.17</version>
+                    <version>1.3.19</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>2.5.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>1.3.1</version>
                 </plugin>
-
             </plugins>
         </pluginManagement>
 

From dfe89ddc821e009d877b275aebe256a2b852a75e Mon Sep 17 00:00:00 2001
From: Nayan Hajratwala <nayan@chikli.com>
Date: Tue, 18 Mar 2014 16:04:01 -0400
Subject: [PATCH 2/2] added mockito-core to base pom

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index c2ec93e965..c0503da5dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -325,6 +325,11 @@
                 <artifactId>mockito-all</artifactId>
                 <version>${mockito.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>${mockito.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>