Cleaning

jenkinsci · Jul 20, 2017 · 8db36c5 · 8db36c5
1 parent cf45a5a
commit 8db36c5
Show file tree

Hide file tree

Showing 9 changed files with 281 additions and 99 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Violation Comments to GitLab changelog
 Changelog of Violation Comments to GitLab plugin for Jenkins.
+## Unreleased
+### No issue
+
+**Cleaning**
+
+
+[85d8084fa858d8a](https://github.com/repos/jenkinsci/violation-comments-to-gitlab-plugin/85d8084fa858d8a4313bbb9fc2a547b13f61f4f6) Tomas Bjerre *2017-07-16 05:12:29*
+
+**doc**
+
+
+[cf45a5aa041e3c8](https://github.com/repos/jenkinsci/violation-comments-to-gitlab-plugin/cf45a5aa041e3c848aa0660b0671e5cd4a1ed638) Tomas Bjerre *2017-07-15 13:11:30*
+
+
 ## 1.9
 ### No issue
 

diff --git a/README.md b/README.md
@@ -147,14 +147,26 @@ job('GitLab_MR_Builder') {
      regexpFilter("")
     }
     genericVariable {
-     key("OBJECT_KIND")
+     key("MR_OBJECT_KIND")
      value("\$.object_kind")
      expressionType("JSONPath")
      regexpFilter("")
     }
+    genericVariable {
+     key("MR_OLD_REV")
+     value("\$.object_attributes.oldrev")
+     expressionType("JSONPath")
+     regexpFilter("")
+    }
+    genericVariable {
+     key("MR_ACTION")
+     value("\$.object_attributes.action")
+     expressionType("JSONPath")
+     regexpFilter("")
+    }
    }
-   regexpFilterText("\$OBJECT_KIND")
-   regexpFilterExpression("merge_request")
+   regexpFilterText("\$MR_OBJECT_KIND \$MR_ACTION \$MR_OLD_REV")
+   regexpFilterExpression("^merge_request\\supdate\\s.+")
   }
  }
  steps {
@@ -312,9 +324,10 @@ node {
 # Plugin development
 More details on Jenkins plugin development is available [here](https://wiki.jenkins-ci.org/display/JENKINS/Plugin+tutorial).
 
-There is a ```/build.sh``` that will perform a full build and test the plugin. You may have a look at sandbox/settings.xml on how to configure your Maven settings.
+There is a ```/build.sh``` that will perform a full build and test the plugin.
+
+If you have release-permissions this is how you do a release:
 
-A release is created like this. You need to clone from jenkinsci-repo, with https and have username/password in settings.xml.
 ```
 mvn release:prepare release:perform
 ```
diff --git a/build.sh b/build.sh
diff --git a/logging.properties b/logging.properties
@@ -0,0 +1,6 @@
+# Logging
+handlers = java.util.logging.ConsoleHandler
+org.jenkinsci.plugins.jvcts.level = FINE
+
+# Console Logging
+java.util.logging.ConsoleHandler.level = FINE
diff --git a/pom.xml b/pom.xml
@@ -101,7 +101,6 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.1</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>

diff --git a/sandbox/gitlab-mergerequest-comment.json b/sandbox/gitlab-mergerequest-comment.json
@@ -0,0 +1,129 @@
+{
+   "object_kind":"note",
+   "user":{
+      "name":"Administrator",
+      "username":"root",
+      "avatar_url":"http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon"
+   },
+   "project_id":1,
+   "project":{
+      "name":"violations-test",
+      "description":"",
+      "web_url":"http://a3dffa263a40/root/violations-test",
+      "avatar_url":null,
+      "git_ssh_url":"git@a3dffa263a40:root/violations-test.git",
+      "git_http_url":"http://a3dffa263a40/root/violations-test.git",
+      "namespace":"root",
+      "visibility_level":20,
+      "path_with_namespace":"root/violations-test",
+      "default_branch":"feature/addingcrap",
+      "homepage":"http://a3dffa263a40/root/violations-test",
+      "url":"git@a3dffa263a40:root/violations-test.git",
+      "ssh_url":"git@a3dffa263a40:root/violations-test.git",
+      "http_url":"http://a3dffa263a40/root/violations-test.git"
+   },
+   "object_attributes":{
+      "id":28,
+      "note":"asdasd",
+      "noteable_type":"MergeRequest",
+      "author_id":1,
+      "created_at":"2017-03-03 23:31:59 UTC",
+      "updated_at":"2017-03-03 23:31:59 UTC",
+      "project_id":1,
+      "attachment":null,
+      "line_code":null,
+      "commit_id":"",
+      "noteable_id":1,
+      "system":false,
+      "st_diff":null,
+      "updated_by_id":null,
+      "type":null,
+      "position":null,
+      "original_position":null,
+      "resolved_at":null,
+      "resolved_by_id":null,
+      "discussion_id":"56f0eeee7c7f486a2b0070d1c6ccdf2bd9919e6f",
+      "original_discussion_id":null,
+      "url":"http://a3dffa263a40/root/violations-test/merge_requests/1#note_28"
+   },
+   "repository":{
+      "name":"violations-test",
+      "url":"git@a3dffa263a40:root/violations-test.git",
+      "description":"",
+      "homepage":"http://a3dffa263a40/root/violations-test"
+   },
+   "merge_request":{
+      "id":1,
+      "target_branch":"master",
+      "source_branch":"feature/addingcrap",
+      "source_project_id":1,
+      "author_id":1,
+      "assignee_id":null,
+      "title":"some crap",
+      "created_at":"2017-02-20 19:54:06 UTC",
+      "updated_at":"2017-03-03 23:31:59 UTC",
+      "milestone_id":null,
+      "state":"opened",
+      "merge_status":"can_be_merged",
+      "target_project_id":1,
+      "iid":1,
+      "description":"",
+      "position":0,
+      "locked_at":null,
+      "updated_by_id":null,
+      "merge_error":null,
+      "merge_params":{
+         "force_remove_source_branch":null
+      },
+      "merge_when_build_succeeds":false,
+      "merge_user_id":null,
+      "merge_commit_sha":null,
+      "deleted_at":null,
+      "in_progress_merge_commit_sha":null,
+      "lock_version":null,
+      "time_estimate":0,
+      "source":{
+         "name":"violations-test",
+         "description":"",
+         "web_url":"http://a3dffa263a40/root/violations-test",
+         "avatar_url":null,
+         "git_ssh_url":"git@a3dffa263a40:root/violations-test.git",
+         "git_http_url":"http://a3dffa263a40/root/violations-test.git",
+         "namespace":"root",
+         "visibility_level":20,
+         "path_with_namespace":"root/violations-test",
+         "default_branch":"feature/addingcrap",
+         "homepage":"http://a3dffa263a40/root/violations-test",
+         "url":"git@a3dffa263a40:root/violations-test.git",
+         "ssh_url":"git@a3dffa263a40:root/violations-test.git",
+         "http_url":"http://a3dffa263a40/root/violations-test.git"
+      },
+      "target":{
+         "name":"violations-test",
+         "description":"",
+         "web_url":"http://a3dffa263a40/root/violations-test",
+         "avatar_url":null,
+         "git_ssh_url":"git@a3dffa263a40:root/violations-test.git",
+         "git_http_url":"http://a3dffa263a40/root/violations-test.git",
+         "namespace":"root",
+         "visibility_level":20,
+         "path_with_namespace":"root/violations-test",
+         "default_branch":"feature/addingcrap",
+         "homepage":"http://a3dffa263a40/root/violations-test",
+         "url":"git@a3dffa263a40:root/violations-test.git",
+         "ssh_url":"git@a3dffa263a40:root/violations-test.git",
+         "http_url":"http://a3dffa263a40/root/violations-test.git"
+      },
+      "last_commit":{
+         "id":"1c3e5deb451353c34264b98c77836012a2106515",
+         "message":"asd\n",
+         "timestamp":"2017-02-21T21:14:14+01:00",
+         "url":"http://a3dffa263a40/root/violations-test/commit/1c3e5deb451353c34264b98c77836012a2106515",
+         "author":{
+            "name":"Tomas Bjerre",
+            "email":"tomas.bjerre85@gmail.com"
+         }
+      },
+      "work_in_progress":false
+   }
+}
diff --git a/sandbox/gitlab-mergerequest-push.json b/sandbox/gitlab-mergerequest-push.json
@@ -0,0 +1,113 @@
+{  
+   "object_kind":"merge_request",
+   "user":{  
+      "name":"Administrator",
+      "username":"root",
+      "avatar_url":"http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon"
+   },
+   "project":{  
+      "name":"violations-test",
+      "description":"",
+      "web_url":"http://846c453ea620/root/violations-test",
+      "avatar_url":null,
+      "git_ssh_url":"git@846c453ea620:root/violations-test.git",
+      "git_http_url":"http://846c453ea620/root/violations-test.git",
+      "namespace":"root",
+      "visibility_level":20,
+      "path_with_namespace":"root/violations-test",
+      "default_branch":"master",
+      "homepage":"http://846c453ea620/root/violations-test",
+      "url":"git@846c453ea620:root/violations-test.git",
+      "ssh_url":"git@846c453ea620:root/violations-test.git",
+      "http_url":"http://846c453ea620/root/violations-test.git"
+   },
+   "object_attributes":{  
+      "id":1,
+      "target_branch":"master",
+      "source_branch":"feature/addingcrap",
+      "source_project_id":1,
+      "author_id":1,
+      "assignee_id":null,
+      "title":"some crap 2",
+      "created_at":"2017-07-15 07:31:01 UTC",
+      "updated_at":"2017-07-20 18:49:48 UTC",
+      "milestone_id":null,
+      "state":"opened",
+      "merge_status":"unchecked",
+      "target_project_id":1,
+      "iid":1,
+      "description":"",
+      "position":0,
+      "locked_at":null,
+      "updated_by_id":1,
+      "merge_error":null,
+      "merge_params":{  
+         "force_remove_source_branch":"0"
+      },
+      "merge_when_pipeline_succeeds":false,
+      "merge_user_id":null,
+      "merge_commit_sha":null,
+      "deleted_at":null,
+      "in_progress_merge_commit_sha":null,
+      "lock_version":1,
+      "time_estimate":0,
+      "source":{  
+         "name":"violations-test",
+         "description":"",
+         "web_url":"http://846c453ea620/root/violations-test",
+         "avatar_url":null,
+         "git_ssh_url":"git@846c453ea620:root/violations-test.git",
+         "git_http_url":"http://846c453ea620/root/violations-test.git",
+         "namespace":"root",
+         "visibility_level":20,
+         "path_with_namespace":"root/violations-test",
+         "default_branch":"master",
+         "homepage":"http://846c453ea620/root/violations-test",
+         "url":"git@846c453ea620:root/violations-test.git",
+         "ssh_url":"git@846c453ea620:root/violations-test.git",
+         "http_url":"http://846c453ea620/root/violations-test.git"
+      },
+      "target":{  
+         "name":"violations-test",
+         "description":"",
+         "web_url":"http://846c453ea620/root/violations-test",
+         "avatar_url":null,
+         "git_ssh_url":"git@846c453ea620:root/violations-test.git",
+         "git_http_url":"http://846c453ea620/root/violations-test.git",
+         "namespace":"root",
+         "visibility_level":20,
+         "path_with_namespace":"root/violations-test",
+         "default_branch":"master",
+         "homepage":"http://846c453ea620/root/violations-test",
+         "url":"git@846c453ea620:root/violations-test.git",
+         "ssh_url":"git@846c453ea620:root/violations-test.git",
+         "http_url":"http://846c453ea620/root/violations-test.git"
+      },
+      "last_commit":{  
+         "id":"29c79ef42415790839584003088fa9f6032af0d4",
+         "message":"some crap\n",
+         "timestamp":"2017-07-20T20:49:38+02:00",
+         "url":"http://846c453ea620/root/violations-test/commit/29c79ef42415790839584003088fa9f6032af0d4",
+         "author":{  
+            "name":"Tomas Bjerre",
+            "email":"tomas.bjerre85@gmail.com"
+         }
+      },
+      "work_in_progress":false,
+      "total_time_spent":0,
+      "human_total_time_spent":null,
+      "human_time_estimate":null,
+      "url":"http://846c453ea620/root/violations-test/merge_requests/1",
+      "action":"update",
+      "oldrev":"7e23c9a980197fe49fae67fb23687c857ff42f86"
+   },
+   "labels":[  
+
+   ],
+   "repository":{  
+      "name":"violations-test",
+      "url":"git@846c453ea620:root/violations-test.git",
+      "description":"",
+      "homepage":"http://846c453ea620/root/violations-test"
+   }
+}