Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add workflow-multibranch-plugin #280

Merged
merged 1 commit into from
Sep 30, 2020
Merged

Add workflow-multibranch-plugin #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions bom-latest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<workflow-api-plugin.version>2.40</workflow-api-plugin.version>
<workflow-cps-plugin.version>2.83</workflow-cps-plugin.version>
<workflow-job-plugin.version>2.39</workflow-job-plugin.version>
<workflow-multibranch-plugin.version>2.22</workflow-multibranch-plugin.version>
<workflow-step-api-plugin.version>2.22</workflow-step-api-plugin.version>
<workflow-support-plugin.version>3.5</workflow-support-plugin.version>
</properties>
Expand Down Expand Up @@ -85,6 +86,17 @@
<classifier>tests</classifier>
<version>${workflow-job-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-multibranch</artifactId>
<version>${workflow-multibranch-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-multibranch</artifactId>
<classifier>tests</classifier>
<version>${workflow-multibranch-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-scm-step</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion sample-plugin/check.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ assert artifactMap['junit:junit'] == project.artifactMap['junit:junit']
def managedPluginDeps = managedDeps.collect {stripAllButGA(it)}.grep { ga ->
def art = artifactMap[ga]
if (art == null) {
if (ga.contains('.plugins:')) { // TODO without an Artifact, we have no reliable way of checking whether it is actually a plugin
if (ga.contains('.plugins')) { // TODO without an Artifact, we have no reliable way of checking whether it is actually a plugin
throw new org.apache.maven.plugin.MojoFailureException("Managed plugin dependency $ga not listed in test classpath of sample plugin")
} else {
println "Do not see managed dependency $ga"
Expand Down
13 changes: 7 additions & 6 deletions sample-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@
<artifactId>workflow-basic-steps</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
Expand All @@ -96,11 +91,17 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<artifactId>workflow-multibranch</artifactId>
<scope>test</scope>
</dependency>
chriskilding marked this conversation as resolved.
Show resolved Hide resolved
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-multibranch</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down