aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Damovsky <martin.damovsky@gmail.com>2017-02-23 19:40:05 +0100
committerGitHub <noreply@github.com>2017-02-23 19:40:05 +0100
commitf20d8807e9cd4d10e21de76156f571d2b7162a53 (patch)
tree1b2c88d9ffe2cc4d4a5a3348a3f126af73a684ab
parent4d049eda8513cdf1c12285d1785d73498ab63d66 (diff)
parentf4093a80a1addfa60dccda8684a09ca801062293 (diff)
downloadbbprb-f20d8807e9cd4d10e21de76156f571d2b7162a53.tar.gz
Merge pull request #113 from jenkinsci/master
merge jenkinsci/ to nishio-dens/
-rw-r--r--pom.xml2
-rw-r--r--src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/Pullrequest.java2
2 files changed, 1 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index a0fdd11..95d6524 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<artifactId>bitbucket-pullrequest-builder</artifactId>
<name>Bitbucket Pullrequest Builder Plugin</name>
- <version>1.4.22-SNAPSHOT</version>
+ <version>1.4.25-SNAPSHOT</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>
diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/Pullrequest.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/Pullrequest.java
index 5cf1fa7..7949d5a 100644
--- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/Pullrequest.java
+++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/Pullrequest.java
@@ -217,12 +217,10 @@ public class Pullrequest {
return getId() != null ? getId().hashCode() : 0;
}
- @JsonProperty("comment_id")
public Integer getId() {
return id;
}
- @JsonProperty("comment_id")
public void setId(Integer id) {
this.id = id;
}