diff --git a/pom.xml b/pom.xml index 3dc2bdcc..9f07df78 100644 --- a/pom.xml +++ b/pom.xml @@ -59,6 +59,16 @@ 8 + + + + org.jenkins-ci + annotation-indexer + 1.11 + + + + commons-httpclient @@ -80,6 +90,11 @@ credentials 2.1.5 + + org.jenkins-ci + symbol-annotation + 1.5 + org.apache.httpcomponents httpclient diff --git a/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java b/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java index 18baef86..fbdf8009 100644 --- a/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java +++ b/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java @@ -40,6 +40,7 @@ import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; +import org.jenkinsci.Symbol; import org.kohsuke.stapler.AncestorInPath; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; @@ -73,9 +74,6 @@ public class StashBuildTrigger extends Trigger> { private transient StashPullRequestsBuilder stashPullRequestsBuilder; - @Extension - public static final StashBuildTriggerDescriptor descriptor = new StashBuildTriggerDescriptor(); - @DataBoundConstructor public StashBuildTrigger( String projectPath, @@ -331,6 +329,8 @@ public boolean isOnlyBuildOnComment() { return onlyBuildOnComment; } + @Extension + @Symbol("stashPullRequestBuilder") public static final class StashBuildTriggerDescriptor extends TriggerDescriptor { public StashBuildTriggerDescriptor() { load();