From ea5f6594c205d4ecc089bccea55c1752331aaae7 Mon Sep 17 00:00:00 2001
From: Dan Alvizu <dalvizu@pingidentity.com>
Date: Tue, 27 Jun 2017 14:48:52 -0600
Subject: [PATCH 1/3] JENKINS-45137 fix xml migration

Set build card to standard build card, if not defined
---
 .../buildpipeline/BuildPipelineView.java       |  6 +++---
 .../buildpipeline/BuildPipelineViewTest.java   | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java
index 46ccace4..371c8d27 100644
--- a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java
+++ b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java
@@ -298,9 +298,9 @@ protected Object readResolve() {
             } else {
                 rowHeaders = new SimpleRowHeader();
             }
-            if (buildCard == null) {
-                buildCard = new StandardBuildCard();
-            }
+        }
+        if (buildCard == null) {
+            buildCard = new StandardBuildCard();
         }
         return this;
     }
diff --git a/src/test/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineViewTest.java b/src/test/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineViewTest.java
index b6687af3..127948fb 100644
--- a/src/test/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineViewTest.java
+++ b/src/test/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineViewTest.java
@@ -222,6 +222,24 @@ public void testMigration() throws IOException {
         assertEquals(SimpleColumnHeader.class, testView.getColumnHeaders().getClass());
         assertNotNull(testView.getBuildCard());
         assertEquals(StandardBuildCard.class, testView.getBuildCard().getClass());
+
+        testView = new BuildPipelineView("My Build Pipeline Name",
+                "My Build Pipeline Title", new DownstreamProjectGridBuilder("Sample Project"),
+                "3", false, false,
+                false /* showPipelineParameters */,
+                false /* showPipelineParametersInHeaders */,
+                true /* showPipelineDefinitionHeader */,
+                3,
+                null,
+                null,
+                new SimpleColumnHeader(),
+                new SimpleRowHeader(),
+                null);
+        testView.readResolve();
+        assertNotNull(testView.getColumnHeaders());
+        assertEquals(SimpleColumnHeader.class, testView.getColumnHeaders().getClass());
+        assertNotNull(testView.getBuildCard());
+        assertEquals(StandardBuildCard.class, testView.getBuildCard().getClass());
     }
 
 	@Test

From 05ce5fc0414aa833063e0e3341f41a536a6a5f60 Mon Sep 17 00:00:00 2001
From: Dan Alvizu <dalvizu@pingidentity.com>
Date: Tue, 27 Jun 2017 15:05:36 -0600
Subject: [PATCH 2/3] [maven-release-plugin] prepare release
 build-pipeline-plugin-1.5.7.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index dd80c1e0..1d661b33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
         <version>1.619</version>
     </parent>
     <artifactId>build-pipeline-plugin</artifactId>
-    <version>1.5.8-SNAPSHOT</version>
+    <version>1.5.7.1</version>
     <packaging>hpi</packaging>
     <name>Build Pipeline Plugin</name>
     <description>This plugin provides build pipeline functionality to Hudson and Jenkins. This allows a chain of jobs to be visualised in a new view.  Manual jobs in the pipeline can be triggered by a user with the appropriate permissions manually confirming.</description>
@@ -21,7 +21,7 @@
         <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}.git</connection>
         <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}.git</developerConnection>
         <url>https://github.com/jenkinsci/build-pipeline-plugin</url>
-        <tag>HEAD</tag>
+        <tag>build-pipeline-plugin-1.5.7.1</tag>
     </scm>
     <properties>
         <code.coverage.percentage>50</code.coverage.percentage>

From 81bab52bbc20e206f92e8f6a124f518eba49db7e Mon Sep 17 00:00:00 2001
From: Dan Alvizu <dalvizu@pingidentity.com>
Date: Tue, 27 Jun 2017 15:05:41 -0600
Subject: [PATCH 3/3] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1d661b33..dd80c1e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
         <version>1.619</version>
     </parent>
     <artifactId>build-pipeline-plugin</artifactId>
-    <version>1.5.7.1</version>
+    <version>1.5.8-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <name>Build Pipeline Plugin</name>
     <description>This plugin provides build pipeline functionality to Hudson and Jenkins. This allows a chain of jobs to be visualised in a new view.  Manual jobs in the pipeline can be triggered by a user with the appropriate permissions manually confirming.</description>
@@ -21,7 +21,7 @@
         <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}.git</connection>
         <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}.git</developerConnection>
         <url>https://github.com/jenkinsci/build-pipeline-plugin</url>
-        <tag>build-pipeline-plugin-1.5.7.1</tag>
+        <tag>HEAD</tag>
     </scm>
     <properties>
         <code.coverage.percentage>50</code.coverage.percentage>