aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorShinsuke Nishio <nishio@densan-labs.net>2016-01-31 16:33:29 +0900
committerShinsuke Nishio <nishio@densan-labs.net>2016-01-31 16:33:29 +0900
commit6a9340ea2cf96f283e26b996b88d2c520401bd21 (patch)
treee9b4a5b11311b2369729c60d8ddeda532c0eb324 /pom.xml
parent85dc025c4339cfa7f629809aa8ed0ee2ebdb6cb1 (diff)
parent96ab7a75f14d9990f3c8f1255f9790c496a64473 (diff)
downloadbbprb-6a9340ea2cf96f283e26b996b88d2c520401bd21.tar.gz
merge pr/71 and resolve conflict
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml23
1 files changed, 17 insertions, 6 deletions
diff --git a/pom.xml b/pom.xml
index 8863269..4eda429 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,15 +3,15 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
- <version>1.509.4</version><!-- which version of Jenkins is this plugin built against? -->
+ <version>1.509.4</version><!-- which version of Jenkins is this plugin built against? -->
</parent>
<artifactId>bitbucket-pullrequest-builder</artifactId>
<name>Bitbucket Pullrequest Builder Plugin</name>
- <version>1.4.9-SNAPSHOT</version>
+ <version>1.4.13</version>
<description>This Jenkins plugin builds pull requests from Bitbucket.org and will report the test results.</description>
<packaging>hpi</packaging>
- <url>https://wiki.jenkins-ci.org/display/JENKINS/Bitbucket+pullrequest+builder+plugin</url>
+ <url>https://wiki.jenkins-ci.org/display/JENKINS/Bitbucket+pullrequest+builder+plugin</url>
<scm>
<connection>scm:git:ssh://git@github.com/jenkinsci/bitbucket-pullrequest-builder-plugin.git</connection>
@@ -25,10 +25,10 @@
<name>nishio_dens</name>
<email>nishio@densan-labs.net</email>
</developer>
- </developers>
-
+ </developers>
+
<!-- get every artifact through repo.jenkins-ci.org, which proxies all the artifacts that we need -->
- <repositories>
+ <repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
@@ -61,6 +61,17 @@
<artifactId>git</artifactId>
<version>2.2.4</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>14.0-rc3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<pluginRepositories>