From e71fa5819a71eb91f1be8e03dd6e504eafca61f3 Mon Sep 17 00:00:00 2001
From: georgevicbell <george_vic_bell@hotmail.com>
Date: Tue, 4 Oct 2016 15:35:02 -0400
Subject: [PATCH 1/5] Update AbstractClearCaseScm.java

---
 .../java/hudson/plugins/clearcase/AbstractClearCaseScm.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java b/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java
index 57ebc82e..1de1c768 100644
--- a/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java
+++ b/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java
@@ -90,6 +90,7 @@
 import org.jenkinsci.remoting.Role;
 import org.jenkinsci.remoting.RoleChecker;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
  * Abstract class for ClearCase SCM. The class contains the logic around checkout and polling, the deriving classes only have to implement the specific checkout
@@ -153,6 +154,7 @@ public enum ChangeSetLevel {
 
         private String name;
 
+        @DataBoundConstructor
         private ChangeSetLevel(String name) {
             this.name = name;
         }

From fcc73a89a83027595a5fda96fa38b52bd137363f Mon Sep 17 00:00:00 2001
From: georgevicbell <george_vic_bell@hotmail.com>
Date: Tue, 4 Oct 2016 15:41:25 -0400
Subject: [PATCH 2/5] Update AbstractClearCaseScm.java

---
 .../java/hudson/plugins/clearcase/AbstractClearCaseScm.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java b/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java
index 1de1c768..3b54a4f7 100644
--- a/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java
+++ b/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java
@@ -155,7 +155,7 @@ public enum ChangeSetLevel {
         private String name;
 
         @DataBoundConstructor
-        private ChangeSetLevel(String name) {
+        public ChangeSetLevel(String name) {
             this.name = name;
         }
 

From 0e51fafd175968a9b56e1939cc796b06277d7ad9 Mon Sep 17 00:00:00 2001
From: georgevicbell <george_vic_bell@hotmail.com>
Date: Tue, 4 Oct 2016 19:07:54 -0400
Subject: [PATCH 3/5] Update AbstractClearCaseScm.java

---
 .../java/hudson/plugins/clearcase/AbstractClearCaseScm.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java b/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java
index 3b54a4f7..57ebc82e 100644
--- a/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java
+++ b/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java
@@ -90,7 +90,6 @@
 import org.jenkinsci.remoting.Role;
 import org.jenkinsci.remoting.RoleChecker;
 import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
  * Abstract class for ClearCase SCM. The class contains the logic around checkout and polling, the deriving classes only have to implement the specific checkout
@@ -154,8 +153,7 @@ public enum ChangeSetLevel {
 
         private String name;
 
-        @DataBoundConstructor
-        public ChangeSetLevel(String name) {
+        private ChangeSetLevel(String name) {
             this.name = name;
         }
 

From a3190e5ae99355f987261d5e5b14ca3e914db159 Mon Sep 17 00:00:00 2001
From: georgevicbell <george_vic_bell@hotmail.com>
Date: Tue, 4 Oct 2016 19:12:04 -0400
Subject: [PATCH 4/5] Update config.jelly

---
 .../clearcase/ClearCaseUcmSCM/config.jelly      | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/hudson/plugins/clearcase/ClearCaseUcmSCM/config.jelly b/src/main/resources/hudson/plugins/clearcase/ClearCaseUcmSCM/config.jelly
index 972528c9..969c56c3 100644
--- a/src/main/resources/hudson/plugins/clearcase/ClearCaseUcmSCM/config.jelly
+++ b/src/main/resources/hudson/plugins/clearcase/ClearCaseUcmSCM/config.jelly
@@ -56,18 +56,11 @@
     But this causes the artifacts from the
     previous build to remain when a new build starts.
   </f:entry>
-  <f:entry title="Changeset" help="/plugin/clearcase/ucm/help-changeset.html">
-    <table>
-      <f:radioBlock name="ucm.changeset" title="No History"
-        checked="${scm.changeset.name eq 'no'}" value="no" />
-      <f:radioBlock name="ucm.changeset" title="Current stream"
-        checked="${scm.changeset eq null || scm.changeset.name eq 'branch'}"
-        value="branch" />
-      <f:radioBlock name="ucm.changeset" title="Current stream + rebases"
-        checked="${scm.changeset.name eq 'all'}" value="all" />
-    </table>
+  <f:entry title="Changeset" field="changeset" help="/plugin/clearcase/ucm/help-changeset.html">
+	<f:enum>  
+ 	       ${it.toString()}  
+        </f:enum>  
   </f:entry>
-  
   <f:entry title="Build foundation baseline" field="buildFoundationBaseline">
   	<f:checkbox/>
   </f:entry>
@@ -171,4 +164,4 @@
       </table>
     </f:block>
   </f:advanced>
-</j:jelly>
\ No newline at end of file
+</j:jelly>

From 07528dbe27ee86f37409165df5dfe9bfcdcf08ab Mon Sep 17 00:00:00 2001
From: georgevicbell <george_vic_bell@hotmail.com>
Date: Tue, 4 Oct 2016 19:13:15 -0400
Subject: [PATCH 5/5] Update config.jelly

---
 .../hudson/plugins/clearcase/ClearCaseUcmSCM/config.jelly       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/hudson/plugins/clearcase/ClearCaseUcmSCM/config.jelly b/src/main/resources/hudson/plugins/clearcase/ClearCaseUcmSCM/config.jelly
index 969c56c3..7b95d384 100644
--- a/src/main/resources/hudson/plugins/clearcase/ClearCaseUcmSCM/config.jelly
+++ b/src/main/resources/hudson/plugins/clearcase/ClearCaseUcmSCM/config.jelly
@@ -56,7 +56,7 @@
     But this causes the artifacts from the
     previous build to remain when a new build starts.
   </f:entry>
-  <f:entry title="Changeset" field="changeset" help="/plugin/clearcase/ucm/help-changeset.html">
+  <f:entry title="Changeset" field="ucm.changeset" help="/plugin/clearcase/ucm/help-changeset.html">
 	<f:enum>  
  	       ${it.toString()}  
         </f:enum>