commit 95ce239be7e0c555ea7cc56a7bbe727ece80c817
author David Pursehouse <david.pursehouse@sonymobile.com> Tue Mar 03 10:43:32 2015 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Tue Mar 03 10:43:32 2015 +0900
tree a362c377f1ade00d478675f0d9c7ccd8fa616cbb
parent 29040d9b4ac4aa0ed1e6e676c6cc3cda36e17aa4
parent 133d0a22f4116ebf11c283fd0a9c3bbdcd9e8d8a

Merge branch 'stable-2.11'

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

Conflicts:
	lib/gerrit/BUCK
	pom.xml

Change-Id: I203ddb3be86d3de64c79e3f3ce4df1bedcf03a07

pom.xml

diff --git a/pom.xml b/pom.xml
index d4dcf41..2ea24d5 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.12-SNAPSHOT</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
-    <Gerrit-ApiVersion>2.12-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>