diff --git a/blueocean-pipeline-api-impl/src/test/java/io/jenkins/blueocean/rest/impl/pipeline/MultiBranchTest.java b/blueocean-pipeline-api-impl/src/test/java/io/jenkins/blueocean/rest/impl/pipeline/MultiBranchTest.java index fb040f10182..0d7fed27ef1 100644 --- a/blueocean-pipeline-api-impl/src/test/java/io/jenkins/blueocean/rest/impl/pipeline/MultiBranchTest.java +++ b/blueocean-pipeline-api-impl/src/test/java/io/jenkins/blueocean/rest/impl/pipeline/MultiBranchTest.java @@ -1082,6 +1082,7 @@ public void getPipelineJobRunsNoBranches() throws Exception { @Test public void testMultiBranchPipelineQueueContainer() throws Exception { + j.jenkins.setQuietPeriod(0); WorkflowMultiBranchProject mp = j.jenkins.createProject(WorkflowMultiBranchProject.class, "p"); sampleRepo1.init(); sampleRepo1.write("Jenkinsfile", "stage 'build'\n " + "node {echo 'Building'}\n" + diff --git a/blueocean-pipeline-editor/pom.xml b/blueocean-pipeline-editor/pom.xml index 2c312237631..7a667ff16ce 100644 --- a/blueocean-pipeline-editor/pom.xml +++ b/blueocean-pipeline-editor/pom.xml @@ -62,10 +62,6 @@ org.jenkinsci.plugins pipeline-model-definition - - org.jenkins-ci.plugins - docker-workflow - org.jenkins-ci.plugins sonar diff --git a/blueocean-pipeline-editor/src/test/java/io/blueocean/rest/pipeline/editor/PipelineMetadataServiceTest.java b/blueocean-pipeline-editor/src/test/java/io/blueocean/rest/pipeline/editor/PipelineMetadataServiceTest.java index 76f91c3a2ee..97e72b7d0ab 100644 --- a/blueocean-pipeline-editor/src/test/java/io/blueocean/rest/pipeline/editor/PipelineMetadataServiceTest.java +++ b/blueocean-pipeline-editor/src/test/java/io/blueocean/rest/pipeline/editor/PipelineMetadataServiceTest.java @@ -4,7 +4,7 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.hamcrest.Matcher; -import org.jenkinsci.plugins.docker.workflow.declarative.DockerPipeline; +import org.jenkinsci.plugins.pipeline.modeldefinition.agent.impl.Label; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; @@ -57,7 +57,7 @@ public void declarativeAgents() throws Exception { ExportedDescribableModel m = null; for (ExportedDescribableModel a : agents) { - if (a.getType().equals(DockerPipeline.class.getName())) { + if (a.getType().endsWith(Label.class.getName())) { m = a; } } diff --git a/blueocean-rest-impl/pom.xml b/blueocean-rest-impl/pom.xml index 65c58cfe320..c217c29db4b 100644 --- a/blueocean-rest-impl/pom.xml +++ b/blueocean-rest-impl/pom.xml @@ -94,6 +94,12 @@ com.github.ua-parser uap-java + + + org.yaml + snakeyaml + + diff --git a/blueocean/pom.xml b/blueocean/pom.xml index a3a35b218fe..3563812bdcc 100644 --- a/blueocean/pom.xml +++ b/blueocean/pom.xml @@ -149,6 +149,12 @@ com.mashape.unirest unirest-java test + + + org.json + json + + diff --git a/pom.xml b/pom.xml index d2e9661ea32..700d5995b23 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ -SNAPSHOT jenkinsci/blueocean-plugin 8 - 2.176.4 + 2.222.4 javadoc-no-fork 1.7.5 10.13.0 @@ -45,9 +45,6 @@ 0.00 runtime true - 3.3 - 1.6.0 - 2.6.3 @@ -197,6 +194,12 @@ com.mashape.unirest unirest-java test + + + org.json + json + + @@ -229,8 +232,8 @@ io.jenkins.tools.bom - bom-2.176.x - 11 + bom-2.222.x + 22 import pom @@ -360,118 +363,11 @@ ${project.version} - - org.jenkins-ci.plugins - ssh-credentials - 1.17.3 - - - - - - - - - org.jenkins-ci.plugins - git - 4.2.2 - - - org.jenkins-ci.plugins - git - 4.2.2 - tests - test - - - - - org.jenkinsci.plugins - pipeline-model-definition - ${pipeline-model-definition.version} - - - org.jenkins-ci.plugins - git-client - - - - - org.jenkinsci.plugins - pipeline-stage-tags-metadata - ${pipeline-model-definition.version} - - - org.jenkinsci.plugins - pipeline-model-api - ${pipeline-model-definition.version} - - - org.jenkinsci.plugins - pipeline-model-extensions - ${pipeline-model-definition.version} - - - org.jenkins-ci.plugins.workflow - workflow-job - 2.33 - org.jenkins-ci.plugins pipeline-graph-analysis 1.10 - - org.jenkins-ci.plugins.workflow - workflow-multibranch - 2.20 - - - org.jenkins-ci.plugins.workflow - workflow-step-api - 2.22 - - - org.jenkins-ci.plugins.workflow - workflow-durable-task-step - 2.31 - - - org.jenkins-ci.plugins.workflow - workflow-support - ${workflow-support.version} - - - org.jenkins-ci.plugins.workflow - workflow-support - ${workflow-support.version} - tests - - - org.jenkins-ci.plugins.workflow - workflow-basic-steps - 2.18 - - - org.jenkins-ci.plugins.workflow - workflow-scm-step - 2.11 - - - org.jenkins-ci.plugins - pipeline-stage-step - 2.3 - - - org.jenkins-ci.plugins - pipeline-input-step - 2.8 - - - org.jenkins-ci.plugins - pipeline-build-step - 2.7 - org.jenkins-ci.plugins @@ -479,31 +375,7 @@ 1.3.1 - - - org.jenkins-ci.plugins - scm-api - ${scm-api-plugin.version} - - - org.jenkins-ci.plugins - branch-api - 2.0.20 - - - - org.jenkins-ci - annotation-indexer - - - - - - org.jenkins-ci.plugins - docker-workflow - 1.23 - org.jenkins-ci.plugins github-branch-source @@ -568,11 +440,6 @@ - - org.jenkins-ci.plugins - cloudbees-folder - 6.9 - org.jenkins-ci.main jenkins-test-harness-tools @@ -585,11 +452,6 @@ ${jenkins-test-harness.version} test - - org.jenkins-ci.plugins - structs - 1.20 - org.jenkins-ci.plugins pubsub-light @@ -600,17 +462,6 @@ sse-gateway 1.24 - - org.jenkins-ci.plugins - variant - 1.1 - - - org.jenkins-ci.plugins - htmlpublisher - 1.14 - - org.jenkins-ci.plugins github-api @@ -626,11 +477,7 @@ okhttp 3.12.12 - - org.jenkins-ci.plugins - jackson2-api - 2.10.2 - + org.slf4j slf4j-api @@ -669,18 +516,13 @@ org.apache.commons commons-lang3 - 3.9 + 3.11 oro oro 2.0.8 - - org.jenkins-ci.plugins - display-url-api - 2.3.1 - org.bitbucket.b_c jose4j @@ -738,23 +580,6 @@ - - - org.jenkins-ci.plugins - matrix-auth - 1.7 - test - - - - org.jenkins-ci.plugins.icon-shim - icon-set - - - - org.jenkins-ci.plugins @@ -866,13 +691,6 @@ org.eclipse.sisu.plexus 0.1.0 - - org.jenkins-ci.plugins - scm-api - tests - ${scm-api-plugin.version} - test - com.damnhandy handy-uri-templates