Merge branch 'master' into feature/JENKINS-40232

jenkinsci · Jan 26, 2017 · 0fd993b · 0fd993b
2 parents 734ac6b + 8119869
commit 0fd993b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/README.textile b/README.textile
@@ -15,7 +15,11 @@ Here you find information relevant for developer for this plugin.
 
 h2. ChangeLog
 
-h3. 11/27/2016 Version 0.7.1
+01/23/2017 Version 0.7.2
+
+* JENKINS-41091: git-parameter:0.7.1 breaks the multi-line parameters in rebuild
+
+11/27/2016 Version 0.7.1
 
 * JENKINS-39366: Add support for a rebuild-plugin
 * JENKINS-26799: Multiple SCMs plugin support

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.jenkins-ci.tools</groupId>
 	<artifactId>git-parameter</artifactId>
-	<version>0.7.2-SNAPSHOT</version>
+	<version>0.8.0-SNAPSHOT</version>
 	<packaging>hpi</packaging>
 	<name>Git Parameter Plug-In</name>
 	<description>Assign git tag or revision number as parameter in Parametrized builds</description>

diff --git a/src/main/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterRebuild.java b/src/main/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterRebuild.java
@@ -10,6 +10,9 @@ public class GitParameterRebuild extends RebuildParameterProvider {
 
     @Override
     public RebuildParameterPage getRebuildPage(ParameterValue parameterValue) {
-        return new RebuildParameterPage(GitParameterValue.class,"value.jelly");
+        if (parameterValue instanceof GitParameterValue) {
+            return new RebuildParameterPage(parameterValue.getClass(),"value.jelly");
+        }
+        return null;
     }
 }