Skip to content

Commit

Permalink
[JENKINS-58732] Remove docker-workflow dep from blueocean-pipeline-ed…
Browse files Browse the repository at this point in the history 
…itor (#2132)

* [JENKINS-58732] Remove docker-workflow dep from blueocean-pipeline-editor

* Was not correctly excluding snakeyaml from uap-java

* Also had a deps problem on json from unirest-java

* Adapt to jenkinsci/branch-api-plugin#190
  • Loading branch information
@jglick
jglick authored Mar 4, 2021
1 parent 0e853e8 commit 7cbc9d5
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 199 deletions.
1 change: 1 addition & 0 deletions ...eline-api-impl/src/test/java/io/jenkins/blueocean/rest/impl/pipeline/MultiBranchTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" +
Expand Down
4 changes: 0 additions & 4 deletions blueocean-pipeline-editor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@
<groupId>org.jenkinsci.plugins</groupId>
<artifactId>pipeline-model-definition</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>docker-workflow</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>sonar</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions ...e-editor/src/test/java/io/blueocean/rest/pipeline/editor/PipelineMetadataServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Expand Down
6 changes: 6 additions & 0 deletions blueocean-rest-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@
<dependency>
<groupId>com.github.ua-parser</groupId>
<artifactId>uap-java</artifactId>
<exclusions>
<exclusion> <!-- from io.jenkins.plugins:snakeyaml-api -->
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
6 changes: 6 additions & 0 deletions blueocean/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@
<groupId>com.mashape.unirest</groupId>
<artifactId>unirest-java</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>
Expand Down
204 changes: 11 additions & 193 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/blueocean-plugin</gitHubRepo>
<java.level>8</java.level>
<jenkins.version>2.176.4</jenkins.version> <!-- Should be kept in sync with the version resulting from Dockerfile FROM statement-->
<jenkins.version>2.222.4</jenkins.version>
<javadoc.exec.goal>javadoc-no-fork</javadoc.exec.goal> <!-- stop initialize phase plugins executing twice -->
<frontend-version>1.7.5</frontend-version>
<node.version>10.13.0</node.version>
Expand All @@ -45,9 +45,6 @@
<jacoco.missedclass.coverage>0.00</jacoco.missedclass.coverage>
<hpi.dependencyResolution>runtime</hpi.dependencyResolution>
<access-modifier-checker.failOnError>true</access-modifier-checker.failOnError>
<workflow-support.version>3.3</workflow-support.version>
<pipeline-model-definition.version>1.6.0</pipeline-model-definition.version>
<scm-api-plugin.version>2.6.3</scm-api-plugin.version>
</properties>

<scm>
Expand Down Expand Up @@ -197,6 +194,12 @@
<groupId>com.mashape.unirest</groupId>
<artifactId>unirest-java</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Needed for unirest -->
Expand Down Expand Up @@ -229,8 +232,8 @@

<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.176.x</artifactId>
<version>11</version>
<artifactId>bom-2.222.x</artifactId>
<version>22</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -360,150 +363,19 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-credentials</artifactId>
<version>1.17.3</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.jenkins-ci.plugins</groupId>-->
<!-- <artifactId>trilead-api</artifactId>-->
<!-- <version>1.0.5</version>-->
<!-- </dependency>-->

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>4.2.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>4.2.2</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>

<!-- Pipeline plugins -->
<dependency>
<groupId>org.jenkinsci.plugins</groupId>
<artifactId>pipeline-model-definition</artifactId>
<version>${pipeline-model-definition.version}</version>
<exclusions>
<exclusion>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git-client</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkinsci.plugins</groupId>
<artifactId>pipeline-stage-tags-metadata</artifactId>
<version>${pipeline-model-definition.version}</version>
</dependency>
<dependency>
<groupId>org.jenkinsci.plugins</groupId>
<artifactId>pipeline-model-api</artifactId>
<version>${pipeline-model-definition.version}</version>
</dependency>
<dependency>
<groupId>org.jenkinsci.plugins</groupId>
<artifactId>pipeline-model-extensions</artifactId>
<version>${pipeline-model-definition.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>2.33</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pipeline-graph-analysis</artifactId>
<version>1.10</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-multibranch</artifactId>
<version>2.20</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
<version>2.22</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-durable-task-step</artifactId>
<version>2.31</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>${workflow-support.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>${workflow-support.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-basic-steps</artifactId>
<version>2.18</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-scm-step</artifactId>
<version>2.11</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pipeline-stage-step</artifactId>
<version>2.3</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pipeline-input-step</artifactId>
<version>2.8</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pipeline-build-step</artifactId>
<version>2.7</version>
</dependency>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pipeline-milestone-step</artifactId>
<version>1.3.1</version>
</dependency>

<!-- scm plugins -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>${scm-api-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>branch-api</artifactId>
<version>2.0.20</version>
<exclusions>
<!-- Upper dependency fix: annotation-indexer comes from core, exclude from git -->
<exclusion>
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Other -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>docker-workflow</artifactId>
<version>1.23</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>github-branch-source</artifactId>
Expand Down Expand Up @@ -568,11 +440,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>cloudbees-folder</artifactId>
<version>6.9</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-test-harness-tools</artifactId>
Expand All @@ -585,11 +452,6 @@
<version>${jenkins-test-harness.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.20</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pubsub-light</artifactId>
Expand All @@ -600,17 +462,6 @@
<artifactId>sse-gateway</artifactId>
<version>1.24</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>variant</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>htmlpublisher</artifactId>
<version>1.14</version>
</dependency>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>github-api</artifactId>
Expand All @@ -626,11 +477,7 @@
<artifactId>okhttp</artifactId>
<version>3.12.12</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>jackson2-api</artifactId>
<version>2.10.2</version>
</dependency>
<!-- TODO many of the following are suspect, should be using core bom -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down Expand Up @@ -669,18 +516,13 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
<version>3.11</version>
</dependency>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>display-url-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.bitbucket.b_c</groupId>
<artifactId>jose4j</artifactId>
Expand Down Expand Up @@ -738,23 +580,6 @@
</exclusions>
</dependency>

<!-- used in blueocean-rest-impl test -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-auth</artifactId>
<version>1.7</version>
<scope>test</scope>
<exclusions>
<!-- upper bound fix: icon-set comes from core, lets ignore the one coming from matrix-auth
PR https://github.com/jenkinsci/plugin-pom/pull/72
-->
<exclusion>
<groupId>org.jenkins-ci.plugins.icon-shim</groupId>
<artifactId>icon-set</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- used in blueocean-pipeline-editor test -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -866,13 +691,6 @@
<artifactId>org.eclipse.sisu.plexus</artifactId>
<version>0.1.0</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<classifier>tests</classifier>
<version>${scm-api-plugin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.damnhandy</groupId>
<artifactId>handy-uri-templates</artifactId>
Expand Down

0 comments on commit 7cbc9d5

Please sign in to comment.