Merge branch 'master' into progressbar

Conflicts:
	src/main/java/se/diabol/jenkins/pipeline/PipelineFactory.java

examples/JENKINS-22211.yaml

@@ -0,0 +1,29 @@
+- job:
+    name: 'A'
+    builders:
+        - trigger-builds:
+          - project: 'B'
+- job:
+    name: 'B'
+    builders:
+        - trigger-builds:
+          - project: 'C,D'
+- job:
+    name: 'C'
+    parameters:
+      - string:
+          name: BUILD_NUM
+
+- job:
+    name: 'D'
+    parameters:
+      - string:
+          name: BUILD_NUM
+    builders:
+        - trigger-builds:
+          - project: 'E'
+- job:
+    name: 'E'
+    parameters:
+      - string:
+          name: BUILD_NUM

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>se.diabol.jenkins.pipeline</groupId>
     <artifactId>delivery-pipeline-plugin</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>0.7.3-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <name>Delivery Pipeline Plugin</name>
     <url>https://wiki.jenkins-ci.org/display/JENKINS/Delivery+Pipeline+Plugin</url>

src/main/java/se/diabol/jenkins/pipeline/DeliveryPipelineView.java

@@ -24,8 +24,8 @@
 import hudson.util.ListBoxModel;
 import org.kohsuke.stapler.*;
 import org.kohsuke.stapler.export.Exported;
-import se.diabol.jenkins.pipeline.model.Component;
-import se.diabol.jenkins.pipeline.model.Pipeline;
+import se.diabol.jenkins.pipeline.domain.Component;
+import se.diabol.jenkins.pipeline.domain.Pipeline;
 import se.diabol.jenkins.pipeline.sort.ComponentComparator;
 import se.diabol.jenkins.pipeline.sort.ComponentComparatorDescriptor;
 import se.diabol.jenkins.pipeline.util.PipelineUtils;
@@ -230,12 +230,12 @@ public List<Component> getPipelines() {
     }
 
     private Component getComponent(String name, AbstractProject firstJob, boolean showAggregatedPipeline) {
-        Pipeline prototype = PipelineFactory.extractPipeline(name, firstJob);
+        Pipeline pipeline = Pipeline.extractPipeline(name, firstJob);
         List<Pipeline> pipelines = new ArrayList<Pipeline>();
         if (showAggregatedPipeline) {
-            pipelines.add(PipelineFactory.createPipelineAggregated(prototype, getOwnerItemGroup()));
+            pipelines.add(pipeline.createPipelineAggregated(getOwnerItemGroup()));
         }
-        pipelines.addAll(PipelineFactory.createPipelineLatest(prototype, noOfPipelines, getOwnerItemGroup()));
+        pipelines.addAll(pipeline.createPipelineLatest(noOfPipelines, getOwnerItemGroup()));
         return new Component(name, pipelines);
     }
 

src/main/java/se/diabol/jenkins/pipeline/PipelineEnvironmentContributor.java

@@ -22,6 +22,7 @@
 import hudson.model.Run;
 import hudson.model.TaskListener;
 import hudson.model.listeners.RunListener;
+import se.diabol.jenkins.pipeline.util.BuildUtil;
 
 @Extension
 @SuppressWarnings("UnusedDeclaration")
@@ -31,7 +32,7 @@ public class PipelineEnvironmentContributor extends RunListener<Run> {
     public void onStarted(Run run, TaskListener listener) {
         if (run instanceof AbstractBuild) {
             AbstractBuild build = (AbstractBuild) run;
-            AbstractBuild upstreamBuild = PipelineFactory.getUpstreamBuild(build);
+            AbstractBuild upstreamBuild = BuildUtil.getUpstreamBuild(build);
             if (upstreamBuild != null) {
                 String version = PipelineVersionContributor.getVersion(upstreamBuild);
                 if (version != null) {