Fix JENKINS-37507

- Add support for pipeline
jenkinsci · Feb 1, 2018 · 01cdb39 · 01cdb39
1 parent b0ca1d6
commit 01cdb39
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -75,6 +75,11 @@
             <artifactId>commons-net</artifactId>
             <version>3.6</version>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>structs</artifactId>
+            <version>1.2</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/src/main/java/jenkins/plugins/publish_over_ftp/BapFtpPromotionPublisherPlugin.java b/src/main/java/jenkins/plugins/publish_over_ftp/BapFtpPromotionPublisherPlugin.java
@@ -25,27 +25,30 @@
 package jenkins.plugins.publish_over_ftp;
 
 import hudson.Extension;
+import hudson.FilePath;
 import hudson.Launcher;
-import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
-import hudson.model.BuildListener;
+import hudson.model.Run;
+import hudson.model.TaskListener;
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.BuildStepMonitor;
 import hudson.tasks.Notifier;
 import hudson.tasks.Publisher;
 import jenkins.model.Jenkins;
 import jenkins.plugins.publish_over.BPPlugin;
+import jenkins.tasks.SimpleBuildStep;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 import org.kohsuke.stapler.DataBoundConstructor;
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.util.ArrayList;
 
 @SuppressWarnings("PMD.LooseCoupling") // serializable
-public class BapFtpPromotionPublisherPlugin extends Notifier {
+public class BapFtpPromotionPublisherPlugin extends Notifier implements SimpleBuildStep {
 
     private final BapFtpPublisherPlugin delegate;
 
@@ -62,9 +65,9 @@ public BapFtpPublisherPlugin getDelegate() {
     }
 
     @Override
-    public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener)
+    public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath ws, @Nonnull Launcher launcher, @Nonnull TaskListener listener)
                     throws InterruptedException, IOException {
-        return delegate.perform(build, launcher, listener);
+        delegate.perform(run, ws, launcher, listener);
     }
 
     public BuildStepMonitor getRequiredMonitorService() {

diff --git a/src/main/java/jenkins/plugins/publish_over_ftp/BapFtpPublisherPlugin.java b/src/main/java/jenkins/plugins/publish_over_ftp/BapFtpPublisherPlugin.java
@@ -27,6 +27,7 @@
 import hudson.Extension;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import jenkins.model.Jenkins;
 import jenkins.plugins.publish_over.BPPlugin;
@@ -37,6 +38,7 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
+import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 @SuppressWarnings("PMD.LooseCoupling") // serializable
@@ -52,6 +54,26 @@ public BapFtpPublisherPlugin(final ArrayList<BapFtpPublisher> publishers, final
                 paramPublish);
     }
 
+    public List<BapFtpPublisher> getPublishers() {
+        return this.getDelegate().getPublishers();
+    }
+
+    public boolean isContinueOnError() {
+        return this.getDelegate().isContinueOnError();
+    }
+
+    public boolean isFailOnError() {
+        return this.getDelegate().isFailOnError();
+    }
+
+    public boolean isAlwaysPublishFromMaster() {
+        return this.getDelegate().isAlwaysPublishFromMaster();
+    }
+
+    public String getMasterNodeName() {
+        return this.getDelegate().getMasterNodeName();
+    }
+
     public BapFtpParamPublish getParamPublish() {
         return (BapFtpParamPublish) getDelegate().getParamPublish();
     }
@@ -84,6 +106,7 @@ public BapFtpHostConfiguration getConfiguration(final String name) {
     }
 
     @Extension
+    @Symbol("ftpPublisher")
     public static class Descriptor extends BapFtpPublisherPluginDescriptor {
         @Override
         public Object readResolve() {