commit 133d0a22f4116ebf11c283fd0a9c3bbdcd9e8d8a
author David Pursehouse <david.pursehouse@sonymobile.com> Tue Mar 03 10:12:52 2015 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Tue Mar 03 10:12:52 2015 +0900
tree 2fe2d223cb5544c4672b2820d43b04b26490d36c
parent 944edea8cb358e1863f4d84f0b372f3337eb0b3b
parent 5ac8e3475cc284bd1c2159cfded076c959462845

Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Maven: use same version number for plugin version and API version
  Maven: Add missing junit dependency
  Consume API version 2.10
  Consume API version 2.9

Conflicts:
	lib/gerrit/BUCK
	pom.xml

Change-Id: If133617f4e8a46821790d0e6ce3d2c576979654e

pom.xml

diff --git a/pom.xml b/pom.xml
index 85e3337..b765d38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,10 +22,10 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>cookbook-plugin</artifactId>
   <packaging>jar</packaging>
-  <version>0.1</version>
+  <version>2.11-SNAPSHOT</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
-    <Gerrit-ApiVersion>2.11-SNAPSHOT</Gerrit-ApiVersion>
+    <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
   </properties>
 
   <build>
@@ -107,6 +107,12 @@
       <version>2.7.0</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <repositories>