diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 43d62816..90787cbb 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -2,6 +2,6 @@ io.jenkins.tools.incrementals git-changelist-maven-extension - 1.2 + 1.6 diff --git a/Jenkinsfile b/Jenkinsfile index 48bf230e..8d38b971 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1,4 @@ -buildPlugin() \ No newline at end of file +buildPlugin(useContainerAgent: true, configurations: [ + [platform: 'linux', jdk: 17], + [platform: 'windows', jdk: 11], +]) diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml deleted file mode 100644 index f4dbf542..00000000 --- a/findbugs-exclude.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/pom.xml b/pom.xml index 39f55cf5..88681b04 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.4 + 4.67 @@ -13,30 +13,27 @@ hpi Jenkins Bitbucket Plugin integrate Jenkins with BitBucket. - https://github.com/jenkinsci/bitbucket-plugin + https://github.com/jenkinsci/${project.artifactId}-plugin - scm:git:git://github.com/jenkinsci/bitbucket-plugin.git - scm:git:git@github.com:jenkinsci/bitbucket-plugin.git - https://github.com/jenkinsci/bitbucket-plugin + scm:git:https://github.com/${gitHubRepo}.git + scm:git:git@github.com:${gitHubRepo}.git + https://github.com/${gitHubRepo} ${scmTag} 999999-SNAPSHOT - - 2.303.1 - 1.8 - 1.8 - 8 + 2.375.3 + jenkinsci/${project.artifactId}-plugin io.jenkins.tools.bom - bom-2.204.x - 11 + bom-2.375.x + 2179.v0884e842b_859 import pom @@ -46,7 +43,7 @@ MIT - http://www.opensource.org/licenses/mit-license.php + https://opensource.org/license/mit/ @@ -61,85 +58,45 @@ https://repo.jenkins-ci.org/public/ - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.1 - - deploy - - - - org.apache.maven.plugins - maven-javadoc-plugin - - none - - - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.4 - - true - findbugs-exclude.xml - - - - - + org.jenkins-ci.plugins git - - + org.jenkins-ci.plugins mercurial - 2.10 + 1260.vdfb_723cdcc81 org.mockito mockito-core - test org.jenkins-ci.plugins job-dsl - 1.77 + 1.82 true org.jenkins-ci.plugins.workflow workflow-cps - 2.80 tests test - - org.jenkins-ci.plugins.workflow - workflow-multibranch - 2.16 - test - org.jenkins-ci.plugins scm-api - 2.6.3 org.jenkins-ci.plugins.workflow workflow-multibranch - 2.16 - compile diff --git a/src/test/java/com/cloudbees/jenkins/plugins/BitbucketPayloadProcessorTest.java b/src/test/java/com/cloudbees/jenkins/plugins/BitbucketPayloadProcessorTest.java index a76faedc..446d9478 100644 --- a/src/test/java/com/cloudbees/jenkins/plugins/BitbucketPayloadProcessorTest.java +++ b/src/test/java/com/cloudbees/jenkins/plugins/BitbucketPayloadProcessorTest.java @@ -19,7 +19,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class BitbucketPayloadProcessorTest { diff --git a/src/test/java/com/cloudbees/jenkins/plugins/CrumbExclusionTest.java b/src/test/java/com/cloudbees/jenkins/plugins/CrumbExclusionTest.java index 5a4a43be..5591b892 100644 --- a/src/test/java/com/cloudbees/jenkins/plugins/CrumbExclusionTest.java +++ b/src/test/java/com/cloudbees/jenkins/plugins/CrumbExclusionTest.java @@ -1,8 +1,8 @@ package com.cloudbees.jenkins.plugins; -import com.gargoylesoftware.htmlunit.HttpMethod; -import com.gargoylesoftware.htmlunit.WebRequest; -import com.gargoylesoftware.htmlunit.WebResponse; +import org.htmlunit.HttpMethod; +import org.htmlunit.WebRequest; +import org.htmlunit.WebResponse; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule;