Skip to content

Declarative pipeline support #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
greg2001 merged 1 commit into from
Apr 7, 2021
Merged

Declarative pipeline support #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.532.3</version><!-- which version of Jenkins is this plugin built against? Users must have at least this Jenkins version to use this plugin. -->
<version>4.13</version>
</parent>

<properties>
<jenkins.version>2.164.1</jenkins.version> <!-- which version of Jenkins is this plugin built against? Users must have at least this Jenkins version to use this plugin. -->
<java.level>8</java.level>
</properties>

<artifactId>persistent-parameter</artifactId>
<name>Persistent Parameter Plugin</name>
<description>String, text, boolean and choice parameters with default values taken from the previous build (if any).</description>
<url>http://wiki.jenkins-ci.org/display/JENKINS/Persistent+Parameter+Plugin</url>
<version>1.3-SNAPSHOT</version>
<packaging>hpi</packaging>

<licenses>
<license>
<name>MIT License</name>
Expand Down Expand Up @@ -62,19 +67,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5</version>
<version>2.5.3</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.11.2</version>
</dependency>
</dependencies>
<configuration>
<!-- configs ... -->
</configuration>
</plugin>
</plugin>
</plugins>
</build>
</build>

</project>
2 changes: 1 addition & 1 deletion src/main/java/com/gem/persistentparameter/CurrentProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class CurrentProject
}

public static ParameterValue getLastValue(SimpleParameterDefinition parameter, boolean successfulOnly) {
Job job = CurrentProject.getCurrentProject(parameter);
Job<?,?> job = CurrentProject.getCurrentProject(parameter);
if (job != null)
{
Run<? ,?> lastBuild = (successfulOnly ? job.getLastSuccessfulBuild() : job.getLastBuild());
Expand Down
29 changes: 10 additions & 19 deletions src/main/java/com/gem/persistentparameter/PersistentBooleanParameterDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,17 @@
package com.gem.persistentparameter;

import hudson.Extension;
import hudson.model.ParameterValue;
import hudson.model.SimpleParameterDefinition;
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.BooleanParameterValue;
import hudson.model.ParameterDefinition;
import hudson.model.ParameterValue;
import hudson.model.SimpleParameterDefinition;
import net.sf.json.JSONObject;

import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.StaplerRequest;

/**
* {@link ParameterDefinition} that is either 'true' or 'false'.
*
* @author huybrechts
*/
public class PersistentBooleanParameterDefinition extends SimpleParameterDefinition
{
Expand Down Expand Up @@ -70,17 +66,9 @@ public ParameterDefinition copyWithDefaultValue(ParameterValue defaultValue)

public boolean isDefaultValue()
{
try
{
ParameterValue lastValue = CurrentProject.getLastValue(this, successfulOnly);
return ((BooleanParameterValue)lastValue).value;
}
catch(Exception ex)
{
}
return defaultValue;
}

public boolean isSuccessfulOnly()
{
return successfulOnly;
Expand All @@ -94,18 +82,22 @@ public ParameterValue createValue(StaplerRequest req, JSONObject jo)
return value;
}

@Override
public ParameterValue createValue(String value)
{
return new BooleanParameterValue(getName(), Boolean.valueOf(value), getDescription());
return new BooleanParameterValue(getName(), Boolean.parseBoolean(value), getDescription());
}

@Override
public BooleanParameterValue getDefaultParameterValue()
{
return new BooleanParameterValue(getName(), isDefaultValue(), getDescription());
ParameterValue lastValue = CurrentProject.getLastValue(this, successfulOnly);
boolean value = (lastValue instanceof BooleanParameterValue) ? ((BooleanParameterValue)lastValue).getValue() : defaultValue;
return new BooleanParameterValue(getName(), value, getDescription());
}

@Extension
@Symbol({"persistentBoolean", "persistentBooleanParam"})
public static class DescriptorImpl extends ParameterDescriptor
{
@Override
Expand All @@ -120,5 +112,4 @@ public String getHelpFile()
return "/help/parameter/boolean.html";
}
}

}
Loading