Merge pull request #10 from shoreless-ltd/issue-50838

[JENKINS-50838] Change GitLab API support from v3 to v4.
jenkinsci · Apr 26, 2018 · 88cd974 · 88cd974
2 parents 268a0d6 + 3ab60a7
commit 88cd974
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>org.gitlab</groupId>
             <artifactId>java-gitlab-api</artifactId>
-            <version>1.2.6</version>
+            <version>4.0.0</version>
         </dependency>
 	<dependency>
             <groupId>org.jenkins-ci</groupId>

diff --git a/src/main/java/org/jenkinsci/plugins/GitLabAuthenticationToken.java b/src/main/java/org/jenkinsci/plugins/GitLabAuthenticationToken.java
@@ -268,7 +268,7 @@ public Boolean call() throws Exception {
 						// could be non-existant)
 						return Boolean.FALSE;
 					} else {
-						return Boolean.valueOf(repository.isPublic());
+						return repository.isPublic();
 					}
 				}
 			});

diff --git a/src/main/webapp/help/realm/gitlab-api-uri-help.html b/src/main/webapp/help/realm/gitlab-api-uri-help.html
@@ -2,7 +2,7 @@
     <p>
         Normally this value stays as-is. If you are using <b><a href="https://enterprise.gitlab.com">GitLab Enterprise</a></b>
         then you should enter the URI to the <strong>API</strong> root of your GitLab installation
-        (e.g. <b>https://gitlab.company.com</b>. The plugin will automatically add "api/v3" suffix for you.).
+        (e.g. <b>https://gitlab.company.com</b>. The plugin will automatically add "api/v4" suffix for you.).
     <p/>
 
     Notes: