From 1e7cbb0a03b8b3dd165d59f066cd1c183725c764 Mon Sep 17 00:00:00 2001
From: Guy Veraghtert <guy.veraghtert@acerta.be>
Date: Sun, 7 Apr 2019 21:33:41 +0200
Subject: [PATCH 1/5] Fix java.lang.NoSuchMethodError when using
 stashBuildTrigger as a pipelineTrigger in a pipeline script

java.lang.NoSuchMethodError: No such DSL method 'stashBuildTrigger' found among steps [archive, bat, build, catchError, ...

	at org.jenkinsci.plugins.workflow.cps.DSL.invokeMethod(DSL.java:199)
	at org.jenkinsci.plugins.workflow.cps.CpsScript.invokeMethod(CpsScript.java:122)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
	at java.lang.reflect.Method.invoke(Unknown Source)
	at org.codehaus.groovy.reflection.CachedMethod.invoke(CachedMethod.java:93)
---
 .../stashpullrequestbuilder/StashBuildTrigger.java          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java b/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java
index 07588398..d3ec7dea 100644
--- a/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java
+++ b/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java
@@ -39,6 +39,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;
@@ -72,9 +73,6 @@ public class StashBuildTrigger extends Trigger<AbstractProject<?, ?>> {
 
   private transient StashPullRequestsBuilder stashPullRequestsBuilder;
 
-  @Extension
-  public static final StashBuildTriggerDescriptor descriptor = new StashBuildTriggerDescriptor();
-
   @DataBoundConstructor
   public StashBuildTrigger(
       String projectPath,
@@ -332,6 +330,8 @@ public boolean isOnlyBuildOnComment() {
     return onlyBuildOnComment;
   }
 
+  @Extension
+  @Symbol("stashBuildTrigger")
   public static final class StashBuildTriggerDescriptor extends TriggerDescriptor {
     public StashBuildTriggerDescriptor() {
       load();

From 77aec876b0ce46177d1deda921d2e02ff3bdd054 Mon Sep 17 00:00:00 2001
From: Guy Veraghtert <guy.veraghtert@acerta.be>
Date: Fri, 12 Apr 2019 11:25:40 +0200
Subject: [PATCH 2/5] use stashPullRequestBuilder instead of stashBuildTrigger
 in the pipeline scripts

---
 .../stashpullrequestbuilder/StashBuildTrigger.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java b/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java
index d3ec7dea..cdac10b9 100644
--- a/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java
+++ b/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java
@@ -331,7 +331,7 @@ public boolean isOnlyBuildOnComment() {
   }
 
   @Extension
-  @Symbol("stashBuildTrigger")
+  @Symbol("stashPullRequestBuilder")
   public static final class StashBuildTriggerDescriptor extends TriggerDescriptor {
     public StashBuildTriggerDescriptor() {
       load();

From 3d004a0c8eaf8a43c6ca941883df07cc2db17f26 Mon Sep 17 00:00:00 2001
From: Guy Veraghtert <guy.veraghtert@acerta.be>
Date: Sun, 14 Apr 2019 13:33:43 +0200
Subject: [PATCH 3/5] added compile dependency on symbol-annotation

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index d6d96e94..192cef8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,11 @@
       <artifactId>credentials</artifactId>
       <version>2.1.5</version>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci</groupId>
+      <artifactId>symbol-annotation</artifactId>
+      <version>1.3</version>
+    </dependency>
   </dependencies>
 
   <repositories>

From ccee60f5e2bf8069344af15cf476707e98b82ba9 Mon Sep 17 00:00:00 2001
From: Guy Veraghtert <guy.veraghtert@acerta.be>
Date: Sun, 14 Apr 2019 13:43:46 +0200
Subject: [PATCH 4/5] added upperbound for annotation-indexer

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 192cef8b..8b5255cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,11 @@
       <artifactId>symbol-annotation</artifactId>
       <version>1.3</version>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci</groupId>
+      <artifactId>annotation-indexer</artifactId>
+      <version>1.11</version>
+    </dependency>
   </dependencies>
 
   <repositories>

From 2557a1c07119987c5cf2da379044dec58ed2fc97 Mon Sep 17 00:00:00 2001
From: Guy Veraghtert <guy.veraghtert@acerta.be>
Date: Wed, 17 Apr 2019 08:53:22 +0200
Subject: [PATCH 5/5] moved annotation-indexer to dependencyManagement

---
 pom.xml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8b5255cd..ab179d19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,16 @@
     <java.level>8</java.level>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.jenkins-ci</groupId>
+        <artifactId>annotation-indexer</artifactId>
+        <version>1.11</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>commons-httpclient</groupId>
@@ -88,12 +98,7 @@
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>symbol-annotation</artifactId>
-      <version>1.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci</groupId>
-      <artifactId>annotation-indexer</artifactId>
-      <version>1.11</version>
+      <version>1.5</version>
     </dependency>
   </dependencies>