diff --git a/pom.xml b/pom.xml index bd3724c..760bb76 100644 --- a/pom.xml +++ b/pom.xml @@ -1,79 +1,91 @@ - 4.0.0 + 4.0.0 - - org.jenkins-ci.plugins - plugin - 4.52 - - + + org.jenkins-ci.plugins + plugin + 4.88 + + - - 999999-SNAPSHOT - jenkinsci/date-parameter-plugin - - 2.361.4 - - + me.leejay.jenkins + date-parameter + ${changelist} + hpi + Date Parameter Plugin + Java style LocalDate code as parameter in Parametrized builds + https://wiki.jenkins-ci.org/display/JENKINS/Date+Parameter+Plugin + - me.leejay.jenkins - date-parameter - ${changelist} - hpi - Date Parameter Plugin - https://wiki.jenkins-ci.org/display/JENKINS/Date+Parameter+Plugin - Java style LocalDate code as parameter in Parametrized builds - + + + MIT License + http://opensource.org/licenses/MIT + + - - - MIT License - http://opensource.org/licenses/MIT - - + + + leejaycoke + JuHyun Lee + leejaycoke@gmail.com + +9 + + - - scm:git:git://github.com/${gitHubRepo}.git - scm:git:git@github.com:${gitHubRepo}.git - https://github.com/${gitHubRepo} - ${scmTag} + + scm:git:https://github.com/${gitHubRepo}.git + scm:git:git@github.com:${gitHubRepo}.git + ${scmTag} + https://github.com/${gitHubRepo} - - - leejaycoke - JuHyun Lee - leejaycoke@gmail.com - +9 - - - - - - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - - - - - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - - + + 999999-SNAPSHOT + jenkinsci/date-parameter-plugin + + 2.462.3 + + + + + + joda-time + joda-time + 2.9.9 + compile + + - - - - joda-time - joda-time - 2.9.9 - compile - - + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + + com.github.spotbugs + spotbugs-maven-plugin + + src/main/resources/spotbugs-exclude.xml + true + target + + + + diff --git a/src/main/java/me/leejay/jenkins/dateparameter/DateParameterDefinition.java b/src/main/java/me/leejay/jenkins/dateparameter/DateParameterDefinition.java index 53cbb9e..99aef83 100644 --- a/src/main/java/me/leejay/jenkins/dateparameter/DateParameterDefinition.java +++ b/src/main/java/me/leejay/jenkins/dateparameter/DateParameterDefinition.java @@ -1,5 +1,7 @@ package me.leejay.jenkins.dateparameter; +import static org.apache.commons.lang.StringUtils.isEmpty; + import hudson.Extension; import hudson.model.ParameterDefinition; import hudson.model.ParameterValue; @@ -11,16 +13,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.commons.lang.StringUtils.isEmpty; - /** * Created by JuHyunLee on 2017. 5. 23.. */ public class DateParameterDefinition extends ParameterDefinition { - private final static Logger log = LoggerFactory.getLogger(DateParameterDefinition.class); + private static final Logger log = LoggerFactory.getLogger(DateParameterDefinition.class); - private final static long serialVersionUID = 776445397055325795L; + private static final long serialVersionUID = 776445397055325795L; private final StringLocalDateValue stringLocalDateValue; @@ -90,7 +90,7 @@ public ParameterValue createValue(StaplerRequest staplerRequest) { @Extension public static final class DescriptorImpl extends ParameterDescriptor { - private final static String DISPLAY_NAME = "Date Parameter"; + private static final String DISPLAY_NAME = "Date Parameter"; @Override public String getDisplayName() { @@ -111,7 +111,8 @@ public FormValidation doCheckDateFormat(@QueryParameter String dateFormat) { return FormValidation.ok(); } - public FormValidation doCheckDefaultValue(@QueryParameter String dateFormat, @QueryParameter String defaultValue) { + public FormValidation doCheckDefaultValue( + @QueryParameter String dateFormat, @QueryParameter String defaultValue) { StringLocalDateValue value = new StringLocalDateValue(defaultValue, dateFormat); if (value.isCompletionFormat()) { return FormValidation.ok(); @@ -124,5 +125,4 @@ public FormValidation doCheckDefaultValue(@QueryParameter String dateFormat, @Qu return FormValidation.error("Invalid default value"); } } - } diff --git a/src/main/java/me/leejay/jenkins/dateparameter/DateParameterValue.java b/src/main/java/me/leejay/jenkins/dateparameter/DateParameterValue.java index a5137ed..988cebb 100644 --- a/src/main/java/me/leejay/jenkins/dateparameter/DateParameterValue.java +++ b/src/main/java/me/leejay/jenkins/dateparameter/DateParameterValue.java @@ -9,18 +9,17 @@ import hudson.model.StringParameterValue; import hudson.tasks.BuildWrapper; import hudson.util.VariableResolver; -import org.apache.commons.lang.StringUtils; -import org.kohsuke.stapler.DataBoundConstructor; - import java.io.IOException; import java.util.Objects; +import org.apache.commons.lang.StringUtils; +import org.kohsuke.stapler.DataBoundConstructor; /** * Created by JuHyunLee on 2017. 5. 23.. */ public class DateParameterValue extends StringParameterValue { - private final static long serialVersionUID = -3270996447541190520L; + private static final long serialVersionUID = -3270996447541190520L; private String dateFormat; @@ -80,8 +79,10 @@ public BuildWrapper createBuildWrapper(AbstractBuild build) { if (!value.isCompletionFormat()) { return new BuildWrapper() { @Override - public Environment setUp(AbstractBuild build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException { - throw new AbortException("Can't parse date format '" + getValue() + "' with '" + getDateFormat() + "'"); + public Environment setUp(AbstractBuild build, Launcher launcher, BuildListener listener) + throws IOException, InterruptedException { + throw new AbortException( + "Can't parse date format '" + getValue() + "' with '" + getDateFormat() + "'"); } }; } diff --git a/src/main/java/me/leejay/jenkins/dateparameter/IntegerParamMethod.java b/src/main/java/me/leejay/jenkins/dateparameter/IntegerParamMethod.java index 3743001..6b7657f 100644 --- a/src/main/java/me/leejay/jenkins/dateparameter/IntegerParamMethod.java +++ b/src/main/java/me/leejay/jenkins/dateparameter/IntegerParamMethod.java @@ -1,10 +1,9 @@ package me.leejay.jenkins.dateparameter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Created by JuHyunLee on 2017. 6. 2.. @@ -13,7 +12,7 @@ public class IntegerParamMethod { private final Logger log = LoggerFactory.getLogger(this.getClass()); - private final static Pattern PATTERN = Pattern.compile("^(?.+)\\((?[0-9]+)\\);?$"); + private static final Pattern PATTERN = Pattern.compile("^(?.+)\\((?[0-9]+)\\);?$"); public String name; @@ -42,5 +41,4 @@ public String getName() { public Integer getParameter() { return parameter; } - } diff --git a/src/main/java/me/leejay/jenkins/dateparameter/StringLocalDateValue.java b/src/main/java/me/leejay/jenkins/dateparameter/StringLocalDateValue.java index 0ee41f0..70d2103 100644 --- a/src/main/java/me/leejay/jenkins/dateparameter/StringLocalDateValue.java +++ b/src/main/java/me/leejay/jenkins/dateparameter/StringLocalDateValue.java @@ -1,16 +1,15 @@ package me.leejay.jenkins.dateparameter; -import org.joda.time.LocalDateTime; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; +import org.joda.time.LocalDateTime; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Created by JuHyunLee on 2017. 6. 2.. @@ -21,7 +20,8 @@ public class StringLocalDateValue implements Serializable { private static final long serialVersionUID = 8295455815421939737L; - private static final String JAVA_PATTERN = "^LocalDate(Time)?\\.now\\(\\)(\\.(plus|minus)(Seconds|Minutes|Hours|Days|Months|Years)\\([0-9]+\\))*;?$"; + private static final String JAVA_PATTERN = + "^LocalDate(Time)?\\.now\\(\\)(\\.(plus|minus)(Seconds|Minutes|Hours|Days|Months|Years)\\([0-9]+\\))*;?$"; private final String stringLocalDate; @@ -96,5 +96,4 @@ String getValue() { return ""; } - } diff --git a/src/main/resources/spotbugs-exclude.xml b/src/main/resources/spotbugs-exclude.xml new file mode 100644 index 0000000..f713362 --- /dev/null +++ b/src/main/resources/spotbugs-exclude.xml @@ -0,0 +1,9 @@ + + + + + + + + +