diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000..4e0774d --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,7 @@ + + + io.jenkins.tools.incrementals + git-changelist-maven-extension + 1.8 + + diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000..2a0299c --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,2 @@ +-Pconsume-incrementals +-Pmight-produce-incrementals diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..c60041e --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,4 @@ +buildPlugin(useContainerAgent: true, configurations: [ + [platform: 'linux', jdk: 21], + [platform: 'windows', jdk: 17], +]) \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7d5d397..b61958f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,101 +1,88 @@ - 4.0.0 + 4.0.0 - - org.jenkins-ci.plugins - plugin - 2.37 - + + org.jenkins-ci.plugins + plugin + 4.88 + + - com.switchfly - gitlab-merge-request-jenkins - 2.1.0-SNAPSHOT - hpi + com.switchfly + gitlab-merge-request-jenkins + ${revision}${changelist} + hpi - Gitlab Merge Request Builder - A plugin to build merge requests in Gitlab - https://wiki.jenkins-ci.org/display/JENKINS/Gitlab+Merge+Request+Builder+Plugin + Gitlab Merge Request Builder + A plugin to build merge requests in Gitlab - - scm:git:ssh://github.com/timols/jenkins-gitlab-merge-request-builder-plugin.git - scm:git:ssh://git@github.com/timols/jenkins-gitlab-merge-request-builder-plugin.git - https://github.com/timols/jenkins-gitlab-merge-request-builder-plugin - HEAD - + + + timols + Tim Olshansky + tim.olshansky@gmail.com + + - - - timols - Tim Olshansky - tim.olshansky@gmail.com - - + + scm:git:https://github.com/${gitHubRepo}.git + scm:git:https://git@github.com/${gitHubRepo}.git + ${scmTag} + https://github.com/${gitHubRepo} + - - - 8 - 2.121 - UTF-8 - 1.8 - - - - - repo.jenkins-ci.org - http://repo.jenkins-ci.org/public/ - - + + 2.1.0 + -SNAPSHOT + timols/jenkins-gitlab-merge-request-builder-plugin + + 2.452.4 + + - - - org.jmockit - jmockit - 1.22 - test - - - junit - junit - 4.12 - test - - - org.hamcrest - hamcrest-all - 1.3 - test - - - com.google.code.gson - gson - 2.8.5 - - - org.gitlab - java-gitlab-api - 4.0.0 - + + io.jenkins.tools.bom + bom-2.452.x + 3814.v9563d972079a_ + pom + import + + + + + + io.jenkins.plugins + gson-api + + + org.gitlab + java-gitlab-api + 4.0.0 + + + + org.jmockit + jmockit + 1.22 + test + + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + - - repo.jenkins-ci.org - http://repo.jenkins-ci.org/public/ - + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + - - - - maven-compiler-plugin - - ${java.compiler.version} - ${java.compiler.version} - ${project.build.sourceEncoding} - - - - diff --git a/src/main/java/org/jenkinsci/plugins/gitlab/models/webhook/MergeRequest.java b/src/main/java/org/jenkinsci/plugins/gitlab/models/webhook/MergeRequest.java index 4423a7e..e3f9cca 100755 --- a/src/main/java/org/jenkinsci/plugins/gitlab/models/webhook/MergeRequest.java +++ b/src/main/java/org/jenkinsci/plugins/gitlab/models/webhook/MergeRequest.java @@ -3,7 +3,6 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonSyntaxException; -import jnr.ffi.annotations.In; /** * Created by lordx_000 on 11/14/2015. diff --git a/src/main/java/org/jenkinsci/plugins/gitlab/models/webhook/OnlyType.java b/src/main/java/org/jenkinsci/plugins/gitlab/models/webhook/OnlyType.java index a3e6e4a..cce48f9 100755 --- a/src/main/java/org/jenkinsci/plugins/gitlab/models/webhook/OnlyType.java +++ b/src/main/java/org/jenkinsci/plugins/gitlab/models/webhook/OnlyType.java @@ -1,18 +1,22 @@ -package org.jenkinsci.plugins.gitlab.models.webhook; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonSyntaxException; - -/** - * Created by lordx_000 on 11/14/2015. - */ -public class OnlyType { - public String object_kind; - - public static OnlyType fromJson(String jsonString) throws JsonSyntaxException { - Gson g = new GsonBuilder().setPrettyPrinting().create(); - return g.fromJson(jsonString, OnlyType.class); - } - -} +package org.jenkinsci.plugins.gitlab.models.webhook; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonSyntaxException; + +/** + * Created by lordx_000 on 11/14/2015. + */ +public class OnlyType { + public String object_kind; + + public String getObject_kind() { + return object_kind; + } + + public static OnlyType fromJson(String jsonString) throws JsonSyntaxException { + Gson g = new GsonBuilder().setPrettyPrinting().create(); + return g.fromJson(jsonString, OnlyType.class); + } + +}