diff --git a/Jenkinsfile b/Jenkinsfile index a229fa5..8d38b97 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1,4 @@ -buildPlugin() +buildPlugin(useContainerAgent: true, configurations: [ + [platform: 'linux', jdk: 17], + [platform: 'windows', jdk: 11], +]) diff --git a/pom.xml b/pom.xml index d02cb09..4125127 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 3.57 + 4.57 @@ -16,11 +16,7 @@ 2.8 999999-SNAPSHOT - 2.164.3 - 8 - 2.39 - 3.5 - 1.17 + 2.375.3 Pipeline: GitHub @@ -38,7 +34,7 @@ scm:git:https://github.com/jenkinsci/${project.artifactId}-plugin.git scm:git:ssh://git@github.com/jenkinsci/${project.artifactId}-plugin.git - http://github.com/jenkinsci/${project.artifactId}-plugin + https://github.com/jenkinsci/${project.artifactId}-plugin ${scmTag} @@ -56,57 +52,30 @@ - - - org.jenkins-ci.plugins - structs - 1.14 - - - - org.jenkins-ci.plugins - scm-api - 2.2.7 - - - - - org.jenkins-ci.plugins.workflow - workflow-step-api - 2.15 - - - - org.jenkins-ci.plugins.workflow - workflow-cps - 2.53 - - org.jenkins-ci.plugins github-branch-source - 2.8.2 + 1703.vd5a_2b_29c6cdc - - - org.apache.commons - commons-lang3 - 3.9 - runtime - org.jenkins-ci.plugins credentials - 2.1.16 + 1224.vc23ca_a_9a_2cb_0 org.jenkins-ci.plugins.workflow workflow-job - 2.21 + 1289.vd1c337fd5354 + + + + org.jenkins-ci.plugins + jackson2-api + 2.13.3-285.vc03c0256d517 @@ -117,33 +86,11 @@ - com.google.code.gson - gson - 2.8.5 - - - - - org.jenkins-ci.plugins - junit - 1.24 - test - - - - org.jenkins-ci.plugins - token-macro - 2.5 - test + org.jenkins-ci.plugins.workflow + workflow-cps + 3653.v07ea_433c90b_4 - - - - - - - diff --git a/src/main/java/org/jenkinsci/plugins/pipeline/github/GitHubHelper.java b/src/main/java/org/jenkinsci/plugins/pipeline/github/GitHubHelper.java index 509aec2..14fb70d 100644 --- a/src/main/java/org/jenkinsci/plugins/pipeline/github/GitHubHelper.java +++ b/src/main/java/org/jenkinsci/plugins/pipeline/github/GitHubHelper.java @@ -61,7 +61,7 @@ public static ExtendedGitHubClient getGitHubClient(@Nonnull final Job job) // configure credentials if (gitHubSource.getCredentialsId() != null) { StandardCredentials credentials = Connector.lookupScanCredentials( - job, gitHubSource.getApiUri(), gitHubSource.getCredentialsId()); + job, gitHubSource.getApiUri(), gitHubSource.getCredentialsId(), gitHubSource.getRepoOwner()); if (credentials instanceof StandardUsernamePasswordCredentials) { StandardUsernamePasswordCredentials c = (StandardUsernamePasswordCredentials) credentials;