From 2dbcb560e23ced02a16bd852e6eef510c35e38fc Mon Sep 17 00:00:00 2001
From: Ilya Beyrak <ibeyrak@sqad.com>
Date: Mon, 16 Apr 2018 08:59:20 -0500
Subject: [PATCH 01/10] add membership=true to gitlab project listings

---
 .../gitlab_branch_source/api/GitLabAPI.java        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java
index 0247c80..19c8bca 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java
@@ -282,18 +282,18 @@ private boolean unregisterProjectHook(String url, int projectId) throws IOExcept
     }
 
     private String projectUrl(String group, GitLabProjectSelector selector, GitLabProjectVisibility visibility, String searchPattern) {
-        StringBuilder urlBuilder = new StringBuilder(GitlabGroup.URL).append(PATH_SEP).append(group).append(GitLabProject.URL);
+        StringBuilder urlBuilder = new StringBuilder(GitlabGroup.URL).append(PATH_SEP).append(group).append(GitLabProject.URL).append("?membership=true");
 
         if (!VISIBLE.equals(selector)) {
-            urlBuilder.append("?").append(selector.id()).append("=true");
+            urlBuilder.append("&").append(selector.id()).append("=true");
         }
 
         if (!ALL.equals(visibility)) {
-            urlBuilder.append(VISIBLE.equals(selector) ? "?" : "&").append("visibility=").append(visibility.id());
+            urlBuilder.append("&").append("visibility=").append(visibility.id());
         }
 
         if (!StringUtils.isEmpty(searchPattern)) {
-            urlBuilder.append(VISIBLE.equals(selector) && ALL.equals(visibility) ? "?" : "&").append("search=").append(searchPattern);
+            urlBuilder.append("&").append("search=").append(searchPattern);
         }
 
         return urlBuilder.toString();
@@ -302,14 +302,14 @@ private String projectUrl(String group, GitLabProjectSelector selector, GitLabPr
 
     private String projectUrl(GitLabProjectSelector selector, GitLabProjectVisibility visibility, String searchPattern) {
         StringBuilder urlBuilder = new StringBuilder(GitlabProject.URL)
-                .append(PATH_SEP).append(selector.id());
+                .append(PATH_SEP).append(selector.id()).append("?membership=true");
 
         if (!ALL.equals(visibility)) {
-            urlBuilder.append("?visibility=").append(visibility.id());
+            urlBuilder.append("&visibility=").append(visibility.id());
         }
 
         if (!StringUtils.isEmpty(searchPattern)) {
-            urlBuilder.append(ALL.equals(visibility) ? "?" : "&").append("search=").append(searchPattern);
+            urlBuilder.append("&").append("search=").append(searchPattern);
         }
 
         return urlBuilder.toString();

From a8a2aa6b7a43c6a7b2e7b914a95cd4a4021e6c19 Mon Sep 17 00:00:00 2001
From: Ilya Beyrak <ibeyrak@sqad.com>
Date: Tue, 17 Apr 2018 13:25:15 -0500
Subject: [PATCH 02/10] add removal of double slashes which occurs and makes
 api fail

---
 .../jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java
index 19c8bca..69611b7 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java
@@ -90,6 +90,7 @@ private List<GitlabBranch> getBranches(Serializable nameOrId) throws GitLabAPIEx
     public GitlabBranch getBranch(int projectId, String branch) throws GitLabAPIException {
         try {
             String tailUrl = GitlabProject.URL + PATH_SEP + projectId + GitlabBranch.URL + PATH_SEP + URLEncoder.encode(branch, "UTF-8");
+            tailUrl = tailUrl.replaceAll("//", "/");
             return delegate.retrieve().to(tailUrl, GitlabBranch.class);
         } catch (FileNotFoundException e) {
             throw new NoSuchElementException("unknown branch " + branch);

From 2d85b291cc206d03b4bac5e1de74fda3fd7ee2e5 Mon Sep 17 00:00:00 2001
From: Ilya Beyrak <ibeyrak@sqad.com>
Date: Tue, 17 Apr 2018 13:26:33 -0500
Subject: [PATCH 03/10] decode MergeRequestHook objectAttributes action as
 string and do it outside of gitlab-plugin as it is wrong there.  Also add
 support for reopen action to do same as Open.

---
 .../api/Hooks/MergeRequestHook.java           | 49 +++++++++++++++
 .../Hooks/MergeRequestObjectAttributes.java   | 50 ++++++++++++++++
 .../api/Hooks/WebHook.java                    | 52 ++++++++++++++++
 .../events/GitLabSCMMergeRequestEvent.java    | 19 ++++--
 .../hooks/HookHandler.java                    | 59 ++++++++++++-------
 5 files changed, 204 insertions(+), 25 deletions(-)
 create mode 100644 src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/Hooks/MergeRequestHook.java
 create mode 100644 src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/Hooks/MergeRequestObjectAttributes.java
 create mode 100644 src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/Hooks/WebHook.java

diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/Hooks/MergeRequestHook.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/Hooks/MergeRequestHook.java
new file mode 100644
index 0000000..0b3c6ad
--- /dev/null
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/Hooks/MergeRequestHook.java
@@ -0,0 +1,49 @@
+package argelbargel.jenkins.plugins.gitlab_branch_source.api.Hooks;
+
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+public class MergeRequestHook extends WebHook {
+
+    private MergeRequestObjectAttributes objectAttributes;
+
+    public MergeRequestObjectAttributes getObjectAttributes() {
+        return objectAttributes;
+    }
+
+    public void setObjectAttributes(MergeRequestObjectAttributes objectAttributes) {
+        this.objectAttributes = objectAttributes;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        MergeRequestHook that = (MergeRequestHook) o;
+        return new EqualsBuilder()
+                .append(objectAttributes, that.objectAttributes)
+                .isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder(17, 37)
+
+                .append(objectAttributes)
+                .toHashCode();
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("objectAttributes", objectAttributes)
+                .toString();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/Hooks/MergeRequestObjectAttributes.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/Hooks/MergeRequestObjectAttributes.java
new file mode 100644
index 0000000..2015c13
--- /dev/null
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/Hooks/MergeRequestObjectAttributes.java
@@ -0,0 +1,50 @@
+package argelbargel.jenkins.plugins.gitlab_branch_source.api.Hooks;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import java.util.Date;
+import java.util.List;
+
+public class MergeRequestObjectAttributes {
+
+    private String action;
+
+
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        MergeRequestObjectAttributes that = (MergeRequestObjectAttributes) o;
+        return new EqualsBuilder()
+                .append(action, that.action)
+                .isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder(17, 37)
+                .append(action)
+                .toHashCode();
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("action", action)
+                .toString();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/Hooks/WebHook.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/Hooks/WebHook.java
new file mode 100644
index 0000000..07624c4
--- /dev/null
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/Hooks/WebHook.java
@@ -0,0 +1,52 @@
+package argelbargel.jenkins.plugins.gitlab_branch_source.api.Hooks;
+
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+/**
+ * @author Robin Müller
+ */
+public abstract class WebHook {
+
+    private String objectKind;
+
+    public String getObjectKind() {
+        return objectKind;
+    }
+
+    public void setObjectKind(String objectKind) {
+        this.objectKind = objectKind;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        WebHook webHook = (WebHook) o;
+        return new EqualsBuilder()
+                .append(objectKind, webHook.objectKind)
+                .isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder(17, 37)
+
+                .append(objectKind)
+                .toHashCode();
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("objectKind", objectKind)
+                .toString();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMMergeRequestEvent.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMMergeRequestEvent.java
index 3fef178..181a2c7 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMMergeRequestEvent.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMMergeRequestEvent.java
@@ -21,13 +21,24 @@
 import static jenkins.scm.api.SCMEvent.Type.REMOVED;
 import static jenkins.scm.api.SCMEvent.Type.UPDATED;
 
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
 
 public final class GitLabSCMMergeRequestEvent extends GitLabSCMHeadEvent<MergeRequestHook> {
-    public static GitLabSCMMergeRequestEvent create(String id, MergeRequestHook hook, String origin) {
-        switch (hook.getObjectAttributes().getAction()) {
-            case open:
+    public static GitLabSCMMergeRequestEvent create(String id, MergeRequestHook hook, String action, String origin) {
+              Logger LOGGER = Logger.getLogger(GitLabSCMMergeRequestEvent.class.getName());
+             
+        if(hook.getObjectAttributes().getAction()==null)
+        {
+              LOGGER.warning("hook ObjectAttributes action is null");
+        }
+        switch (action) {
+            case "open":
+                return new GitLabSCMMergeRequestEvent(CREATED, id, hook, origin);
+            case "reopen":
                 return new GitLabSCMMergeRequestEvent(CREATED, id, hook, origin);
-            case update:
+            case "update":
                 return new GitLabSCMMergeRequestEvent(UPDATED, id, hook, origin);
             default:
                 // other actions are "merged" and "closed". in both cases we can remove the head
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/hooks/HookHandler.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/hooks/HookHandler.java
index d71a587..7150041 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/hooks/HookHandler.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/hooks/HookHandler.java
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.util.NoSuchElementException;
 import java.util.logging.Logger;
+import java.util.logging.Level;
 
 import static argelbargel.jenkins.plugins.gitlab_branch_source.api.GitLabHookEventType.byHeader;
 import static jenkins.scm.api.SCMEvent.originOf;
@@ -35,39 +36,55 @@ void handle(String id, HttpServletRequest request) throws IOException {
     }
 
     private void handle(String id, GitLabHookEventType eventType, HttpServletRequest request) throws IOException {
-        switch (eventType) {
-            case PUSH:
-                SCMHeadEvent.fireNow(new GitLabSCMPushEvent(id, readHook(PushHook.class, request), originOf(request)));
-                break;
-            case TAG_PUSH:
-                SCMHeadEvent.fireNow(new GitLabSCMTagPushEvent(id, readHook(PushHook.class, request), originOf(request)));
-                break;
-            case MERGE_REQUEST:
-                SCMHeadEvent.fireNow(GitLabSCMMergeRequestEvent.create(id, readHook(MergeRequestHook.class, request), originOf(request)));
-                break;
-            case SYSTEM_HOOK:
-                handleSystemHook(id, request);
-                break;
-            default:
-                throw new IllegalArgumentException("cannot handle hook-event of type " + eventType);
+        LOGGER.fine("handling hook for " + id + " for eventType " + eventType);
+        try
+        {
+
+            String requestBody = getRequestBody(request);
+            switch (eventType) {
+                case PUSH:
+                    SCMHeadEvent.fireNow(new GitLabSCMPushEvent(id, readHook(PushHook.class, requestBody), originOf(request)));
+                    break;
+                case TAG_PUSH:
+                    SCMHeadEvent.fireNow(new GitLabSCMTagPushEvent(id, readHook(PushHook.class, requestBody), originOf(request)));
+                    break;
+                case MERGE_REQUEST:
+                    argelbargel.jenkins.plugins.gitlab_branch_source.api.Hooks.MergeRequestHook hookAction= readHookTemp(argelbargel.jenkins.plugins.gitlab_branch_source.api.Hooks.MergeRequestHook.class, requestBody);
+                    SCMHeadEvent.fireNow(GitLabSCMMergeRequestEvent.create(id, readHook(MergeRequestHook.class, requestBody),hookAction.getObjectAttributes().getAction(), originOf(request)));
+                    break;
+                case SYSTEM_HOOK:
+                    handleSystemHook(id, request,requestBody);
+                    break;
+                default:
+                    LOGGER.warning("ignoring hook: " + eventType);
+                    throw new IllegalArgumentException("cannot handle hook-event of type " + eventType);
+            }
+        } catch (Exception e) {
+            LOGGER.log(Level.WARNING, "GitLabHookEventType", e); 
         }
     }
 
-    private void handleSystemHook(String id, HttpServletRequest request) throws IOException {
+    private void handleSystemHook(String id, HttpServletRequest request, String requestBody) throws IOException {
         try {
-            LOGGER.fine("handling system-hook for " + id);
-            SystemHook hook = readHook(SystemHook.class, request);
+            SystemHook hook = readHook(SystemHook.class, requestBody);
             SCMSourceEvent.fireNow(GitLabSCMSourceEvent.create(id, hook, originOf(request)));
         } catch (IllegalArgumentException e) {
             LOGGER.warning("ignoring system hook: " + e.getMessage());
         }
     }
 
-    private <T extends WebHook> T readHook(Class<T> type, HttpServletRequest req) {
+    private <T extends WebHook> T readHook(Class<T> type, String requestBody) {
+        try {
+            return JsonUtil.read(requestBody, type);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("could not read payload");
+        }
+    }
+    private <T extends argelbargel.jenkins.plugins.gitlab_branch_source.api.Hooks.WebHook> T readHookTemp(Class<T> type, String requestBody) {
         try {
-            return JsonUtil.read(getRequestBody(req), type);
+            return JsonUtil.read(requestBody, type);
         } catch (Exception e) {
-            throw new IllegalArgumentException("ould not read payload");
+            throw new IllegalArgumentException("could not read payload");
         }
     }
 

From b93258e5df0e5a0bd923fa892cac138eb857b54b Mon Sep 17 00:00:00 2001
From: Ilya Beyrak <ibeyrak@sqad.com>
Date: Thu, 19 Apr 2018 10:23:53 -0500
Subject: [PATCH 04/10] fix settings screen not storing option for Build Merged
 because of wrong variable

---
 .../settings/GitLabSCMOriginMonitorStrategy/config.jelly        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMOriginMonitorStrategy/config.jelly b/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMOriginMonitorStrategy/config.jelly
index e4fc5db..4f726dc 100644
--- a/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMOriginMonitorStrategy/config.jelly
+++ b/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMOriginMonitorStrategy/config.jelly
@@ -4,7 +4,7 @@
     <f:optionalBlock title="${%Monitor &amp; Build Merge Requests from Origin}" field="monitored" inline="true">
         <f:nested>
             <table>
-                <f:optionalBlock title="${%Build merged with base branch}" field="buildMerged"
+                <f:optionalBlock title="${%Build merged with base branch}" field="build"
                                  checked="${descriptor.defaults.build}" inline="true">
                     <f:entry title="${%Build only mergeable requests}" field="buildOnlyMergeableMerged">
                         <f:checkbox default="${descriptor.defaults.buildOnlyMergeableMerged}"/>

From 062ef0c84036c4e5b173dba85c3f673b7658282f Mon Sep 17 00:00:00 2001
From: Ilya Beyrak <ibeyrak@sqad.com>
Date: Thu, 19 Apr 2018 23:14:11 -0500
Subject: [PATCH 05/10] remove duplicative call to build after merge

---
 .../plugins/gitlab_branch_source/SourceHeads.java     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/SourceHeads.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/SourceHeads.java
index 453e808..af1b793 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/SourceHeads.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/SourceHeads.java
@@ -39,8 +39,13 @@
 import static hudson.model.TaskListener.NULL;
 import static java.util.Collections.emptyMap;
 
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
 
 class SourceHeads {
+
+    private static final Logger LOGGER = Logger.getLogger(SourceHeads.class.getName());
     private static final SCMHeadObserver NOOP_OBSERVER = new SCMHeadObserver() {
         @Override
         public void observe(@Nonnull jenkins.scm.api.SCMHead head, @Nonnull SCMRevision revision) { /* NOOP */ }
@@ -120,11 +125,6 @@ private void retrieveMergeRequest(SCMSourceCriteria criteria, @Nonnull SCMHeadOb
                 log(listener, Messages.GitLabSCMSource_removedMergeRequest(mrId));
                 branchesWithMergeRequests(listener).remove(mrId);
             }
-
-            int sourceProjectId = attributes.getSourceProjectId();
-            if (sourceProjectId == source.getProjectId()) {
-                observe(criteria, observer, createBranch(source.getProjectId(), attributes.getSourceBranch(), attributes.getLastCommit().getId()), listener);
-            }
         }
     }
 
@@ -238,7 +238,6 @@ private void observe(SCMSourceCriteria criteria, @Nonnull SCMHeadObserver observ
                 mergeRequest.getIid(),
                 createBranch(mergeRequest.getSourceProjectId(), mergeRequest.getSourceBranch(), mergeRequest.getSha()),
                 createBranch(mergeRequest.getTargetProjectId(), targetBranch, retrieveBranchRevision(targetBranch)), Objects.equals(mergeRequest.getMergeStatus(), CAN_BE_MERGED));
-
         if (source.getSourceSettings().buildUnmerged(head)) {
             observe(criteria, observer, head, listener);
         }

From 86b092ea2c0f0ec7b42ed0fb95d4a2691fc19fff Mon Sep 17 00:00:00 2001
From: Ilya Beyrak <ibeyrak@sqad.com>
Date: Mon, 7 May 2018 07:26:48 -0500
Subject: [PATCH 06/10] fix test code

---
 .../plugins/gitlab_branch_source/heads/GitLabSCMHead.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/heads/GitLabSCMHead.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/heads/GitLabSCMHead.java
index f30ab62..b12d752 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/heads/GitLabSCMHead.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/heads/GitLabSCMHead.java
@@ -14,11 +14,11 @@ public abstract class GitLabSCMHead extends SCMHead implements SCMHeadMixin {
     public static final String REVISION_HEAD = "HEAD";
 
     public static GitLabSCMBranchHead createBranch(int projectId, String name, String hash) {
-        return createBranch(projectId, name, hash, false);
+        return createBranch(projectId, name+"t2", hash, false);
     }
 
     public static GitLabSCMTagHead createTag(int projectId, String name, String hash, long timestamp) {
-        return new GitLabSCMTagHead(projectId, name, hash, timestamp);
+        return new GitLabSCMTagHead(projectId, name+"t3", hash, timestamp);
     }
 
     public static GitLabSCMMergeRequestHead createMergeRequest(int id, String name, int iid, GitLabSCMHead source, GitLabSCMBranchHead target) {

From 59444ff365765fdf7882cddd66a99280bcdb59ca Mon Sep 17 00:00:00 2001
From: Ilya Beyrak <ibeyrak@sqad.com>
Date: Thu, 7 Jun 2018 21:41:38 -0500
Subject: [PATCH 07/10] update to gitlab v4 api

---
 pom.xml                                       | 39 ++++++++++---------
 .../GitLabSCMBranchBuildStrategy.java         | 11 ++++++
 .../gitlab_branch_source/GitLabSCMIcons.java  |  6 +--
 .../gitlab_branch_source/api/GitLabAPI.java   |  5 ++-
 .../api/GitLabProjectSelector.java            |  2 +-
 5 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index f227e4a..81359b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,8 +12,9 @@
 
     <properties>
         <jenkins.version>2.7.1</jenkins.version>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+	   <java.level>8</java.level>
     </properties>
 
     <groupId>argelbargel.jenkins.plugins</groupId>
@@ -36,47 +37,47 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>branch-api</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.20</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>cloudbees-folder</artifactId>
-            <version>6.0.4</version>
+            <version>6.4</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>credentials</artifactId>
-            <version>2.1.13</version>
+            <version>2.1.16</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>git</artifactId>
-            <version>3.3.0</version>
+            <version>3.9.1</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>git-client</artifactId>
-            <version>2.4.5</version>
+            <version>2.7.2</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>gitlab-plugin</artifactId>
-            <version>1.5.3</version>
+            <version>1.5.6</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>scm-api</artifactId>
-            <version>2.1.1</version>
+            <version>2.2.7</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-api</artifactId>
-            <version>2.13</version>
+            <version>2.27</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-cps</artifactId>
-            <version>2.30</version>
+            <version>2.53</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -86,30 +87,30 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-multibranch</artifactId>
-            <version>2.14</version>
+            <version>2.19</version>
         </dependency>
         <dependency>
             <groupId>org.gitlab</groupId>
             <artifactId>java-gitlab-api</artifactId>
-            <version>1.2.7</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>pipeline-stage-step</artifactId>
-            <version>2.2</version>
+            <version>2.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-basic-steps</artifactId>
-            <version>2.4</version>
+            <version>2.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-durable-task-step</artifactId>
-            <version>2.11</version>
+            <version>2.19</version>
             <scope>test</scope>
         </dependency>
 
@@ -117,14 +118,14 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-scm-step</artifactId>
-            <version>2.4</version>
+            <version>2.6</version>
         </dependency>
 
         <!-- by default 1.4 is installed which causes an StackOverflowError -->
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>structs</artifactId>
-            <version>1.6</version>
+            <version>1.14</version>
             <scope>test</scope>
         </dependency>
 
@@ -132,7 +133,7 @@
                 <dependency>
                     <groupId>org.jenkins-ci.plugins</groupId>
                     <artifactId>github-branch-source</artifactId>
-                    <version>2.0.5</version>
+                    <version>2.3.6</version>
                     <scope>test</scope>
                 </dependency>
         <!-- TODO: i'd like to have those for local development but not when building with travis...
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/GitLabSCMBranchBuildStrategy.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/GitLabSCMBranchBuildStrategy.java
index 1daeb4e..b4afa87 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/GitLabSCMBranchBuildStrategy.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/GitLabSCMBranchBuildStrategy.java
@@ -10,6 +10,7 @@
 import jenkins.scm.api.SCMHead;
 import jenkins.scm.api.SCMSource;
 import jenkins.scm.api.SCMSourceDescriptor;
+import jenkins.scm.api.SCMRevision;
 import jenkins.scm.api.mixin.TagSCMHead;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
@@ -47,6 +48,16 @@ private boolean isAutomaticBuild(GitLabSCMSource source, SCMHead head) {
         return true;
     }
 
+    @Override
+    public boolean isAutomaticBuild(SCMSource source, SCMHead head, SCMRevision var3,  SCMRevision var4)
+    {
+        if (source instanceof GitLabSCMSource) {
+            return isAutomaticBuild((GitLabSCMSource) source, head);
+        }
+
+        return !TagSCMHead.class.isInstance(head);
+    }
+
     private boolean isAutomaticBuild(GitLabSCMSource source, GitLabSCMMergeRequestHead head) {
         if (!head.isMerged()) {
             return true;
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/GitLabSCMIcons.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/GitLabSCMIcons.java
index 6cd948c..9d17441 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/GitLabSCMIcons.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/GitLabSCMIcons.java
@@ -101,9 +101,9 @@ static String iconFilePathPattern(String name) {
 
     private static String groupAvatarUrl(GitlabProject project, String connectionName) throws GitLabAPIException {
         GitlabNamespace namespace = project.getNamespace();
-        if (namespace.getOwnerId() != null) {
-            return null;
-        }
+      //  if (namespace.getOwnerId() != null) {
+      //      return null;
+      //  }
 
         GitLabGroup group = gitLabAPI(connectionName).getGroup(namespace.getId());
         return group.getAvatarUrl();
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java
index 69611b7..4107b85 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabAPI.java
@@ -188,10 +188,11 @@ public List<GitlabRepositoryTree> getTree(int id, String ref, String path) throw
         try {
             Query query = new Query()
                     .appendIf("path", path)
-                    .appendIf("ref_name", ref);
-
+                    .appendIf("ref", ref);
 
+            query.append("per_page","10000");
             String tailUrl = GitlabProject.URL + "/" + id + "/repository" + GitlabRepositoryTree.URL + query.toString();
+            LOGGER.fine("tailurl: " + tailUrl);
             GitlabRepositoryTree[] tree = delegate.retrieve().to(tailUrl, GitlabRepositoryTree[].class);
             return Arrays.asList(tree);
         } catch (Exception e) {
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabProjectSelector.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabProjectSelector.java
index 2065127..e15fdb4 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabProjectSelector.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabProjectSelector.java
@@ -7,7 +7,7 @@
 public enum GitLabProjectSelector {
     OWNED("owned"),
     STARRED("starred"),
-    VISIBLE("visible");
+    VISIBLE("");
 
     public static GitLabProjectSelector byId(String id) {
         for (GitLabProjectSelector value : values()) {

From f47ec80dd3244c0177237d372641e3be3bf47851 Mon Sep 17 00:00:00 2001
From: Ilya Beyrak <ibeyrak@sqad.com>
Date: Thu, 21 Jun 2018 10:16:45 -0500
Subject: [PATCH 08/10] updates based on v4 api and publishing failed stage
 when unstable build

---
 pom.xml                                             |  2 +-
 .../plugins/gitlab_branch_source/SourceHeads.java   |  6 +++---
 .../actions/GitLabSCMAcceptMergeRequestAction.java  |  2 +-
 .../actions/GitLabSCMPublishAction.java             | 13 ++++++++++++-
 .../events/GitLabSCMMergeRequestEvent.java          |  2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 81359b5..2519f74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>gitlab-plugin</artifactId>
-            <version>1.5.6</version>
+            <version>1.5.5</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/SourceHeads.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/SourceHeads.java
index af1b793..09713d7 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/SourceHeads.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/SourceHeads.java
@@ -116,7 +116,7 @@ private void retrieveMergeRequest(SCMSourceCriteria criteria, @Nonnull SCMHeadOb
         String targetBranch = attributes.getTargetBranch();
 
         if (!source.isExcluded(targetBranch)) {
-            int mrId = attributes.getId();
+            int mrId = attributes.getIid();
             log(listener, Messages.GitLabSCMSource_retrievingMergeRequest(mrId));
             try {
                 GitLabMergeRequest mr = api().getMergeRequest(source.getProjectId(), mrId);
@@ -233,7 +233,7 @@ private void observe(SCMSourceCriteria criteria, @Nonnull SCMHeadObserver observ
 
         String targetBranch = mergeRequest.getTargetBranch();
         GitLabSCMMergeRequestHead head = createMergeRequest(
-                mergeRequest.getId(),
+                mergeRequest.getIid(),
                 mergeRequest.getTitle(),
                 mergeRequest.getIid(),
                 createBranch(mergeRequest.getSourceProjectId(), mergeRequest.getSourceBranch(), mergeRequest.getSha()),
@@ -250,7 +250,7 @@ private void observe(SCMSourceCriteria criteria, @Nonnull SCMHeadObserver observ
         }
 
         if (!source.getSourceSettings().getBranchMonitorStrategy().getBuildBranchesWithMergeRequests() && head.fromOrigin()) {
-            branchesWithMergeRequests(listener).put(mergeRequest.getId(), mergeRequest.getSourceBranch());
+            branchesWithMergeRequests(listener).put(mergeRequest.getIid(), mergeRequest.getSourceBranch());
         }
     }
 
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/actions/GitLabSCMAcceptMergeRequestAction.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/actions/GitLabSCMAcceptMergeRequestAction.java
index fb9655e..1737440 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/actions/GitLabSCMAcceptMergeRequestAction.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/actions/GitLabSCMAcceptMergeRequestAction.java
@@ -27,7 +27,7 @@ public final class GitLabSCMAcceptMergeRequestAction extends InvisibleAction imp
 
     public GitLabSCMAcceptMergeRequestAction(GitLabMergeRequest MR, int mergeRequestScopedId, String commitMessage, boolean removeSourceBranch) {
         this.mergeRequestPID = MR.getProjectId();
-        this.mergeRequestID = MR.getId();
+        this.mergeRequestID = MR.getIid();
         this.mergeRequestScopedId = mergeRequestScopedId;
         this.commitMessage = commitMessage;
         this.removeSourceBranch = removeSourceBranch;
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/actions/GitLabSCMPublishAction.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/actions/GitLabSCMPublishAction.java
index e8936d0..03365e9 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/actions/GitLabSCMPublishAction.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/actions/GitLabSCMPublishAction.java
@@ -101,11 +101,15 @@ public void run() {
 
     public void publishResult(Run<?, ?> build, GitLabSCMHeadMetadataAction metadata) {
         Result buildResult = build.getResult();
+
         if ((buildResult == SUCCESS) || ((buildResult == UNSTABLE) && markUnstableAsSuccess)) {
+
             updateRunningContexts(build, metadata, success);
         } else if (buildResult == ABORTED) {
+
             updateRunningContexts(build, metadata, canceled);
         } else {
+
             updateRunningContexts(build, metadata, failed);
         }
     }
@@ -135,7 +139,14 @@ public void onNewHead(FlowNode node) {
             if (isNamedStageStartNode(node)) {
                 publishBuildStatus(build, metadata, running, getRunningContexts().push(node), "");
             } else if (isStageEndNode(node, getRunningContexts().peekNodeId())) {
-                publishBuildStatus(build, metadata, success, getRunningContexts().pop(), "");
+                Result buildResult = build.getResult();
+                if(buildResult==UNSTABLE ) {
+                    publishBuildStatus(build, metadata,failed, getRunningContexts().pop(), "");
+                }
+                else
+                {
+                    publishBuildStatus(build, metadata, success, getRunningContexts().pop(), "");
+                }
             }
         }
 
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMMergeRequestEvent.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMMergeRequestEvent.java
index 181a2c7..0c41f35 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMMergeRequestEvent.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMMergeRequestEvent.java
@@ -82,7 +82,7 @@ Collection<? extends GitLabSCMHead> heads(@Nonnull GitLabSCMSource source) throw
         String sourceBranch = attributes.getSourceBranch();
         String hash = attributes.getLastCommit().getId();
         GitLabSCMMergeRequestHead head = createMergeRequest(
-                attributes.getId(), attributes.getTitle(), attributes.getIid(),
+                attributes.getIid(), attributes.getTitle(), attributes.getIid(),
                 createBranch(sourceProjectId, sourceBranch, hash),
                 createBranch(attributes.getTargetProjectId(), attributes.getTargetBranch(), REVISION_HEAD));
 

From 289aa6d93f1ec2a21035b9b6208d9215cf945417 Mon Sep 17 00:00:00 2001
From: Ilya Beyrak <ibeyrak@sqad.com>
Date: Wed, 11 Jul 2018 13:04:45 -0500
Subject: [PATCH 09/10] fix issues and add prelim support for handling note
 events

---
 pom.xml                                       |   2 +-
 .../gitlab_branch_source/SourceHeads.java     |  57 ++++++++-
 .../api/GitLabHookEventType.java              |   3 +-
 .../events/CauseDataHelper.java               |   8 +-
 .../events/GitLabSCMNoteEvent.java            | 109 ++++++++++++++++++
 .../heads/GitLabSCMHead.java                  |   4 +-
 .../hooks/HookHandler.java                    |   9 +-
 7 files changed, 174 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMNoteEvent.java

diff --git a/pom.xml b/pom.xml
index 2519f74..801b07d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>gitlab-plugin</artifactId>
-            <version>1.5.5</version>
+            <version>1.5.3</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/SourceHeads.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/SourceHeads.java
index 09713d7..9d789b6 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/SourceHeads.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/SourceHeads.java
@@ -1,11 +1,11 @@
 package argelbargel.jenkins.plugins.gitlab_branch_source;
 
-
 import argelbargel.jenkins.plugins.gitlab_branch_source.api.GitLabAPI;
 import argelbargel.jenkins.plugins.gitlab_branch_source.api.GitLabAPIException;
 import argelbargel.jenkins.plugins.gitlab_branch_source.api.GitLabMergeRequest;
 import argelbargel.jenkins.plugins.gitlab_branch_source.api.filters.GitLabMergeRequestFilter;
 import argelbargel.jenkins.plugins.gitlab_branch_source.events.GitLabSCMMergeRequestEvent;
+import argelbargel.jenkins.plugins.gitlab_branch_source.events.GitLabSCMNoteEvent;
 import argelbargel.jenkins.plugins.gitlab_branch_source.events.GitLabSCMPushEvent;
 import argelbargel.jenkins.plugins.gitlab_branch_source.events.GitLabSCMTagPushEvent;
 import argelbargel.jenkins.plugins.gitlab_branch_source.heads.GitLabSCMHead;
@@ -13,12 +13,10 @@
 import argelbargel.jenkins.plugins.gitlab_branch_source.heads.GitLabSCMTagHead;
 import com.dabsquared.gitlabjenkins.gitlab.hook.model.MergeRequestObjectAttributes;
 import hudson.model.TaskListener;
+import jenkins.branch.MultiBranchProject;
+import jenkins.model.ParameterizedJobMixIn;
 import jenkins.plugins.git.AbstractGitSCMSource.SCMRevisionImpl;
-import jenkins.scm.api.SCMHead;
-import jenkins.scm.api.SCMHeadEvent;
-import jenkins.scm.api.SCMHeadObserver;
-import jenkins.scm.api.SCMRevision;
-import jenkins.scm.api.SCMSourceCriteria;
+import jenkins.scm.api.*;
 import org.gitlab.api.models.GitlabBranch;
 import org.gitlab.api.models.GitlabTag;
 
@@ -70,6 +68,8 @@ public boolean isHead(@Nonnull Probe probe, @Nonnull TaskListener taskListener)
     void retrieve(@CheckForNull SCMSourceCriteria criteria, @Nonnull SCMHeadObserver observer, @CheckForNull SCMHeadEvent<?> event, @Nonnull TaskListener listener) throws IOException, InterruptedException {
         if (event instanceof GitLabSCMMergeRequestEvent) {
             retrieveMergeRequest(criteria, observer, (GitLabSCMMergeRequestEvent) event, listener);
+        } else if (event instanceof GitLabSCMNoteEvent) {
+            retrieveMergeRequest(criteria, observer, (GitLabSCMNoteEvent) event, listener);
         } else if (event instanceof GitLabSCMTagPushEvent) {
             retrieveTag(criteria, observer, (GitLabSCMTagPushEvent) event, listener);
         } else if (event instanceof GitLabSCMPushEvent) {
@@ -127,6 +127,46 @@ private void retrieveMergeRequest(SCMSourceCriteria criteria, @Nonnull SCMHeadOb
             }
         }
     }
+    private void retrieveMergeRequest(SCMSourceCriteria criteria, @Nonnull SCMHeadObserver observer, @Nonnull GitLabSCMNoteEvent event, @Nonnull TaskListener listener) throws IOException, InterruptedException {
+        MergeRequestObjectAttributes attributes = event.getPayload().getMergeRequest();
+        String targetBranch = attributes.getTargetBranch();
+        log(listener,"my project is: "+source.getProjectId());
+        try {
+            try {
+                java.lang.reflect.Field f = observer.getClass().getDeclaredField("source"); //NoSuchFieldException
+                f.setAccessible(true);
+                SCMSource iWantThis = (SCMSource) f.get(observer); //IllegalAccessException
+                java.lang.reflect.Field f2 = observer.getClass().getDeclaredField("origBranch"); //NoSuchFieldException
+                f2.setAccessible(true);
+                jenkins.branch.Branch iWantThis2 = (jenkins.branch.Branch) f2.get(observer); //IllegalAccessException
+
+
+                log(listener, "sourceid: " + iWantThis.getId() + " origBranch: " + iWantThis2.getSourceId());
+            }
+            catch (java.lang.IllegalAccessException e)
+            {
+
+                log(listener,"IllegalException was caught" + e.getMessage());
+            }
+        }
+        catch (java.lang.NoSuchFieldException e)
+        {
+            log(listener,"NoSuchFieldException was caught" + e.getMessage());
+        }
+        if (!source.isExcluded(targetBranch)) {
+            int mrId = attributes.getIid();
+            log(listener, Messages.GitLabSCMSource_retrievingMergeRequest(mrId));
+            try {
+                GitLabMergeRequest mr = api().getMergeRequest(source.getProjectId(), mrId);
+             //   log(listener,branch
+              //  ParameterizedJobMixIn.scheduleBuild2()
+                        observe(criteria, observer, mr, listener);
+            } catch (NoSuchElementException e) {
+                log(listener, Messages.GitLabSCMSource_removedMergeRequest(mrId));
+                branchesWithMergeRequests(listener).remove(mrId);
+            }
+        }
+    }
 
     private void retrieveBranch(SCMSourceCriteria criteria, @Nonnull SCMHeadObserver observer, @Nonnull GitLabSCMPushEvent event, @Nonnull TaskListener listener) throws IOException, InterruptedException {
         retrieveBranch(criteria, observer, BRANCHES.remoteName(event.getPayload().getRef()), listener);
@@ -238,7 +278,9 @@ private void observe(SCMSourceCriteria criteria, @Nonnull SCMHeadObserver observ
                 mergeRequest.getIid(),
                 createBranch(mergeRequest.getSourceProjectId(), mergeRequest.getSourceBranch(), mergeRequest.getSha()),
                 createBranch(mergeRequest.getTargetProjectId(), targetBranch, retrieveBranchRevision(targetBranch)), Objects.equals(mergeRequest.getMergeStatus(), CAN_BE_MERGED));
+
         if (source.getSourceSettings().buildUnmerged(head)) {
+
             observe(criteria, observer, head, listener);
         }
 
@@ -255,7 +297,10 @@ private void observe(SCMSourceCriteria criteria, @Nonnull SCMHeadObserver observ
     }
 
     private void observe(SCMSourceCriteria criteria, @Nonnull SCMHeadObserver observer, GitLabSCMHead head, TaskListener listener) throws IOException, InterruptedException {
+
         if (criteria == null || matches(criteria, head, listener)) {
+
+
             observer.observe(head, head.getRevision());
         }
     }
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabHookEventType.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabHookEventType.java
index 9ed0c4d..2fa882d 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabHookEventType.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/api/GitLabHookEventType.java
@@ -8,7 +8,8 @@ public enum GitLabHookEventType {
     MERGE_REQUEST("Merge Request Hook"),
     PUSH("Push Hook"),
     SYSTEM_HOOK("System Hook"),
-    TAG_PUSH("Tag Push Hook");
+    TAG_PUSH("Tag Push Hook"),
+    NOTE("Note Hook");
 
     public static GitLabHookEventType byHeader(String header) {
         if (StringUtils.isBlank(header)) {
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/CauseDataHelper.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/CauseDataHelper.java
index a55a306..aab19b7 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/CauseDataHelper.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/CauseDataHelper.java
@@ -1,10 +1,7 @@
 package argelbargel.jenkins.plugins.gitlab_branch_source.events;
 
 import com.dabsquared.gitlabjenkins.cause.CauseData;
-import com.dabsquared.gitlabjenkins.gitlab.hook.model.Commit;
-import com.dabsquared.gitlabjenkins.gitlab.hook.model.MergeRequestHook;
-import com.dabsquared.gitlabjenkins.gitlab.hook.model.MergeRequestObjectAttributes;
-import com.dabsquared.gitlabjenkins.gitlab.hook.model.PushHook;
+import com.dabsquared.gitlabjenkins.gitlab.hook.model.*;
 import org.eclipse.jgit.util.StringUtils;
 
 import java.util.List;
@@ -47,6 +44,9 @@ static CauseData buildCauseData(PushHook hook) {
     static CauseData buildCauseData(MergeRequestHook hook) {
         return buildCauseData(hook.getObjectAttributes());
     }
+    static CauseData buildCauseData(NoteHook hook) {
+        return buildCauseData(hook.getMergeRequest());
+    }
 
     private static CauseData buildCauseData(MergeRequestObjectAttributes attributes) {
         return causeData()
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMNoteEvent.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMNoteEvent.java
new file mode 100644
index 0000000..9b49947
--- /dev/null
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMNoteEvent.java
@@ -0,0 +1,109 @@
+package argelbargel.jenkins.plugins.gitlab_branch_source.events;
+
+
+import argelbargel.jenkins.plugins.gitlab_branch_source.GitLabSCMSource;
+import argelbargel.jenkins.plugins.gitlab_branch_source.heads.GitLabSCMHead;
+import argelbargel.jenkins.plugins.gitlab_branch_source.heads.GitLabSCMMergeRequestHead;
+import com.dabsquared.gitlabjenkins.cause.CauseData;
+import com.dabsquared.gitlabjenkins.gitlab.hook.model.MergeRequestHook;
+import com.dabsquared.gitlabjenkins.gitlab.hook.model.MergeRequestObjectAttributes;
+import com.dabsquared.gitlabjenkins.gitlab.hook.model.NoteHook;
+
+import javax.annotation.Nonnull;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.logging.Logger;
+
+import static argelbargel.jenkins.plugins.gitlab_branch_source.events.CauseDataHelper.buildCauseData;
+import static argelbargel.jenkins.plugins.gitlab_branch_source.heads.GitLabSCMHead.*;
+import static jenkins.scm.api.SCMEvent.Type.*;
+
+
+public final class GitLabSCMNoteEvent extends GitLabSCMHeadEvent<NoteHook> {
+    public static GitLabSCMNoteEvent create(String id, NoteHook hook, String origin) {
+           //   Logger LOGGER = Logger.getLogger(GitLabSCMNoteEvent.class.getName());
+
+
+        if(hook.getObjectAttributes().getNote().equalsIgnoreCase("jenkins retry"))
+        {
+            if(hook.getMergeRequest()!=null)
+            {
+                return new GitLabSCMNoteEvent(CREATED, id, hook, origin);
+            }
+        }
+
+        return null;
+
+    }
+
+    private GitLabSCMNoteEvent(Type type, String id, NoteHook payload, String origin) {
+        super(type, id, payload, origin);
+    }
+
+    @Override
+    CauseData getCauseData() {
+        Logger.getLogger(GitLabSCMNoteEvent.class.getName()).severe("Note GetCauseData");
+        return buildCauseData(getPayload());
+    }
+
+    @Override
+    protected boolean isMatch(@Nonnull GitLabSCMSource source) {
+
+        Logger.getLogger(GitLabSCMNoteEvent.class.getName()).severe("Note ISMatch");
+        if (!super.isMatch(source) || !isOrigin(source, getAttributes().getTargetProjectId())) {
+
+            Logger.getLogger(GitLabSCMNoteEvent.class.getName()).severe("Note ISMatch returning false");
+            return false;
+        }
+
+        boolean isOrigin = isOrigin(source, getAttributes().getSourceProjectId());
+        boolean rData= ((isOrigin && source.getSourceSettings().getOriginMonitorStrategy().getMonitored()) || (!isOrigin && source.getSourceSettings().getForksMonitorStrategy().getMonitored()));
+
+
+        return rData;
+    }
+
+    private boolean isOrigin(@Nonnull GitLabSCMSource source, Integer projectId) {
+
+        return projectId.equals(source.getProjectId());
+    }
+
+    private MergeRequestObjectAttributes getAttributes() {
+        return getPayload().getMergeRequest();
+    }
+
+    @Override
+    Collection<? extends GitLabSCMHead> heads(@Nonnull GitLabSCMSource source) throws IOException, InterruptedException {
+        Collection<GitLabSCMHead> heads = new ArrayList<>();
+        MergeRequestObjectAttributes attributes = getAttributes();
+        Integer sourceProjectId = attributes.getSourceProjectId();
+        String sourceBranch = attributes.getSourceBranch();
+        String hash = attributes.getLastCommit().getId();
+        GitLabSCMMergeRequestHead head = createMergeRequest(
+                attributes.getIid(), attributes.getTitle(), attributes.getIid(),
+                createBranch(sourceProjectId, sourceBranch, hash),
+                createBranch(attributes.getTargetProjectId(), attributes.getTargetBranch(), REVISION_HEAD));
+
+        Logger.getLogger(GitLabSCMNoteEvent.class.getName()).severe("key area  sourceid: " + source.getId() + " branch id:" +source.getpro);
+        if (source.getSourceSettings().buildUnmerged(head)) {
+            heads.add(head);
+        }
+
+        if (source.getSourceSettings().buildMerged(head)) {
+            heads.add(head.merged());
+        }
+
+        if (head.fromOrigin()) {
+            heads.add(createBranch(sourceProjectId, sourceBranch, hash));
+        }
+
+        return heads;
+    }
+
+    @Nonnull
+    @Override
+    public String getSourceName() {
+        return getAttributes().getTarget().getPathWithNamespace();
+    }
+}
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/heads/GitLabSCMHead.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/heads/GitLabSCMHead.java
index b12d752..f30ab62 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/heads/GitLabSCMHead.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/heads/GitLabSCMHead.java
@@ -14,11 +14,11 @@ public abstract class GitLabSCMHead extends SCMHead implements SCMHeadMixin {
     public static final String REVISION_HEAD = "HEAD";
 
     public static GitLabSCMBranchHead createBranch(int projectId, String name, String hash) {
-        return createBranch(projectId, name+"t2", hash, false);
+        return createBranch(projectId, name, hash, false);
     }
 
     public static GitLabSCMTagHead createTag(int projectId, String name, String hash, long timestamp) {
-        return new GitLabSCMTagHead(projectId, name+"t3", hash, timestamp);
+        return new GitLabSCMTagHead(projectId, name, hash, timestamp);
     }
 
     public static GitLabSCMMergeRequestHead createMergeRequest(int id, String name, int iid, GitLabSCMHead source, GitLabSCMBranchHead target) {
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/hooks/HookHandler.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/hooks/HookHandler.java
index 7150041..b0cc27c 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/hooks/HookHandler.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/hooks/HookHandler.java
@@ -3,13 +3,11 @@
 
 import argelbargel.jenkins.plugins.gitlab_branch_source.api.GitLabHookEventType;
 import argelbargel.jenkins.plugins.gitlab_branch_source.api.SystemHook;
-import argelbargel.jenkins.plugins.gitlab_branch_source.events.GitLabSCMMergeRequestEvent;
-import argelbargel.jenkins.plugins.gitlab_branch_source.events.GitLabSCMPushEvent;
-import argelbargel.jenkins.plugins.gitlab_branch_source.events.GitLabSCMSourceEvent;
-import argelbargel.jenkins.plugins.gitlab_branch_source.events.GitLabSCMTagPushEvent;
+import argelbargel.jenkins.plugins.gitlab_branch_source.events.*;
 import com.dabsquared.gitlabjenkins.gitlab.hook.model.MergeRequestHook;
 import com.dabsquared.gitlabjenkins.gitlab.hook.model.PushHook;
 import com.dabsquared.gitlabjenkins.gitlab.hook.model.WebHook;
+import com.dabsquared.gitlabjenkins.gitlab.hook.model.NoteHook;
 import com.dabsquared.gitlabjenkins.util.JsonUtil;
 import hudson.util.IOUtils;
 import jenkins.scm.api.SCMHeadEvent;
@@ -55,6 +53,9 @@ private void handle(String id, GitLabHookEventType eventType, HttpServletRequest
                 case SYSTEM_HOOK:
                     handleSystemHook(id, request,requestBody);
                     break;
+                case NOTE:
+                    SCMHeadEvent.fireNow(GitLabSCMNoteEvent.create(id, readHook(NoteHook.class, requestBody), originOf(request)));
+                    break;
                 default:
                     LOGGER.warning("ignoring hook: " + eventType);
                     throw new IllegalArgumentException("cannot handle hook-event of type " + eventType);

From 4f90d3ab7613337f62763d89ddff7db87925261f Mon Sep 17 00:00:00 2001
From: Ilya Beyrak <ibeyrak@sqad.com>
Date: Wed, 11 Jul 2018 13:16:31 -0500
Subject: [PATCH 10/10] missed comimt

---
 .../plugins/gitlab_branch_source/events/GitLabSCMNoteEvent.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMNoteEvent.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMNoteEvent.java
index 9b49947..4580955 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMNoteEvent.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/events/GitLabSCMNoteEvent.java
@@ -85,7 +85,7 @@ Collection<? extends GitLabSCMHead> heads(@Nonnull GitLabSCMSource source) throw
                 createBranch(sourceProjectId, sourceBranch, hash),
                 createBranch(attributes.getTargetProjectId(), attributes.getTargetBranch(), REVISION_HEAD));
 
-        Logger.getLogger(GitLabSCMNoteEvent.class.getName()).severe("key area  sourceid: " + source.getId() + " branch id:" +source.getpro);
+        Logger.getLogger(GitLabSCMNoteEvent.class.getName()).severe("key area  sourceid: " + source.getId() + " branch id:");
         if (source.getSourceSettings().buildUnmerged(head)) {
             heads.add(head);
         }