Merge pull request #2 from baymac/feature/upgrade-api

[JENKINS-57850] Feature/upgrade api
baymac · Jun 5, 2019 · 418940a · 418940a
2 parents 9bf6d8a + 5feb157
commit 418940a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>gitlab-api</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/servers/GitLabServer.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/servers/GitLabServer.java
@@ -258,7 +258,7 @@ public ListBoxModel doFillCredentialsIdItems(@QueryParameter String serverUrl, @
             if(!Jenkins.getInstance().hasPermission(Jenkins.ADMINISTER)) {
                 return new StandardListBoxModel().includeCurrentValue(credentialsId);
             }
-            return  new StandardListBoxModel()
+            return new StandardListBoxModel()
                 .includeEmptyValue()
                 .includeMatchingAs(ACL.SYSTEM,
                         Jenkins.getInstance(),

diff --git a/.../jenkins/plugins/gitlabbranchsource/servers/helpers/GitLabPersonalAccessTokenCreator.java b/.../jenkins/plugins/gitlabbranchsource/servers/helpers/GitLabPersonalAccessTokenCreator.java
@@ -51,9 +51,11 @@ public class GitLabPersonalAccessTokenCreator extends Descriptor<GitLabPersonalA
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GitLabPersonalAccessTokenCreator.class);
 
-    private static final List<String> GL_PLUGIN_REQUIRED_SCOPE = ImmutableList.of(
-            Constants.ApplicationScope.API.toValue(),
-            Constants.ApplicationScope.READ_USER.toValue()
+    private static final List<AccessTokenUtils.Scope> GL_PLUGIN_REQUIRED_SCOPE = ImmutableList.of(
+            AccessTokenUtils.Scope.API,
+            AccessTokenUtils.Scope.READ_REGISTRY,
+            AccessTokenUtils.Scope.READ_USER,
+            AccessTokenUtils.Scope.READ_REPOSITORY
     );
 
     public GitLabPersonalAccessTokenCreator() {