Skip to content
Permalink
Browse files

Merge pull request #296 from recena/JENKINS-31153

[JENKINS-31153] Rename Workflow to Pipeline
Originally-Committed-As: 118b89e1b1828a39f50fb955942ffcbbe69e653e
  • Loading branch information
jglick committed Jan 15, 2016
2 parents 68c93d0 + 05ceb09 commit 9db86141e8cc151e53831710f3b263dd7649b954
@@ -32,7 +32,7 @@ THE SOFTWARE.
</parent>
<artifactId>workflow-multibranch</artifactId>
<packaging>hpi</packaging>
<name>Workflow: Multibranch</name>
<name>Pipeline: Multibranch</name>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Workflow+Plugin</url>
<dependencies>
<dependency>
@@ -92,7 +92,7 @@
@Inject public Snippetizer snippetizer;

@Override public String getDisplayName() {
return "Workflow script from " + WorkflowMultiBranchProject.SCRIPT;
return "Pipeline script from " + WorkflowMultiBranchProject.SCRIPT;
}

}
@@ -60,7 +60,7 @@
Run<?,?> build = script.$build();
// TODO some code overlap with SCMBinder.create, but not obvious how to factor out common parts
if (!(build instanceof WorkflowRun)) {
throw new AbortException("not available outside a workflow build");
throw new AbortException("not available outside a Pipeline build");
}
Job<?,?> job = build.getParent();
BranchJobProperty property = job.getProperty(BranchJobProperty.class);
@@ -72,7 +72,7 @@ public WorkflowMultiBranchProject(ItemGroup parent, String name) {
@Extension public static class DescriptorImpl extends MultiBranchProjectDescriptor {

@Override public String getDisplayName() {
return "Multibranch Workflow";
return "Multibranch Pipeline";
}

@Override public TopLevelItem newInstance(ItemGroup parent, String name) {
@@ -54,7 +54,7 @@
}

@Override public String getDisplayName() {
return "Workflow Jenkinsfile";
return "Pipeline Jenkinsfile";
}

}
@@ -25,5 +25,5 @@ THE SOFTWARE.

<?jelly escape-by-default='true'?>
<div>
Defines a project type for multibranch workflows.
Defines a project type for multibranch pipelines.
</div>
@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

body=Creates a set of Workflow projects according to detected branches in one SCM repository.
body=Creates a set of Pipeline projects according to detected branches in one SCM repository.

0 comments on commit 9db8614

Please sign in to comment.
You can’t perform that action at this time.