diff options
author | Martin Damovsky <martin.damovsky@gmail.com> | 2017-06-04 21:14:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-04 21:14:11 +0200 |
commit | 645f4d8d8b9f1acbd55f49743413d9dbc839d728 (patch) | |
tree | 574e9061da25663c7bf31de0634b8253fc9d4575 | |
parent | 54849417f5c97df14f569aff81b3b68c7f00f88a (diff) | |
parent | 127238cf00816e2fdaee5528fb57cb9d799c017c (diff) | |
download | bbprb-645f4d8d8b9f1acbd55f49743413d9dbc839d728.tar.gz |
Merge pull request #123 from jonfogh17/master
Add support for Jenkins pipelines
-rw-r--r-- | pom.xml | 5 | ||||
-rw-r--r-- | src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -67,6 +67,11 @@ <version>2.2.4</version> </dependency> <dependency> + <groupId>org.jenkins-ci</groupId> + <artifactId>symbol-annotation</artifactId> + <version>1.1</version> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>14.0-rc3</version> diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java index bf3fd64..533eef1 100644 --- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java +++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/BitbucketBuildTrigger.java @@ -17,6 +17,7 @@ import jenkins.model.Jenkins; import jenkins.model.ParameterizedJobMixIn; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; +import org.jenkinsci.Symbol; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; @@ -56,7 +57,6 @@ public class BitbucketBuildTrigger extends Trigger<Job<?, ?>> { transient private BitbucketPullRequestsBuilder bitbucketPullRequestsBuilder; - @Extension public static final BitbucketBuildTriggerDescriptor descriptor = new BitbucketBuildTriggerDescriptor(); @DataBoundConstructor @@ -299,6 +299,8 @@ public class BitbucketBuildTrigger extends Trigger<Job<?, ?>> { super.stop(); } + @Extension + @Symbol("bitbucketpr") public static final class BitbucketBuildTriggerDescriptor extends TriggerDescriptor { public BitbucketBuildTriggerDescriptor() { load(); |