From 909f0a6ba8ab362f9114df7cfac428839e697418 Mon Sep 17 00:00:00 2001
From: Jo Shields <jo.shields@xamarin.com>
Date: Thu, 23 Jul 2015 09:21:15 +0100
Subject: [PATCH 1/2] Handle null BuildSelector (Closes: JENKINS-29582)

This drops use of ca:selectorList (removed in copyartifact-1.35.1), and adds a fallback to StatusBuildSelector in the event of a bad BuildSelector being passed from jelly (a similar fallback exists in copyartifact)
---
 .../hudson/plugins/s3/S3CopyArtifact.java     | 10 ++-
 .../hudson/plugins/s3/S3CopyArtifact.stapler  |  2 -
 .../plugins/s3/S3CopyArtifact/config.jelly    |  6 +-
 .../hudson/plugins/s3/selectorList.jelly      | 67 -------------------
 4 files changed, 11 insertions(+), 74 deletions(-)
 delete mode 100644 src/main/resources/hudson/plugins/s3/S3CopyArtifact.stapler
 delete mode 100644 src/main/resources/hudson/plugins/s3/selectorList.jelly

diff --git a/src/main/java/hudson/plugins/s3/S3CopyArtifact.java b/src/main/java/hudson/plugins/s3/S3CopyArtifact.java
index 55fd8169..86eb9a33 100644
--- a/src/main/java/hudson/plugins/s3/S3CopyArtifact.java
+++ b/src/main/java/hudson/plugins/s3/S3CopyArtifact.java
@@ -59,6 +59,7 @@
 import hudson.plugins.copyartifact.Messages;
 import hudson.plugins.copyartifact.ParametersBuildFilter;
 import hudson.plugins.copyartifact.WorkspaceSelector;
+import hudson.plugins.copyartifact.StatusBuildSelector;
 import hudson.security.AccessControlled;
 import hudson.security.SecurityRealm;
 import hudson.tasks.BuildStepDescriptor;
@@ -101,16 +102,21 @@ public class S3CopyArtifact extends Builder {
     private final String filter, target;
     private /*almost final*/ BuildSelector selector;
     private final Boolean flatten, optional;
+    
+    private static final BuildSelector DEFAULT_BUILD_SELECTOR = new StatusBuildSelector(true);
 
     @DataBoundConstructor
-    public S3CopyArtifact(String projectName, BuildSelector selector, String filter, String target,
+    public S3CopyArtifact(String projectName, BuildSelector buildSelector, String filter, String target,
                         boolean flatten, boolean optional) {
         // Prevents both invalid values and access to artifacts of projects which this user cannot see.
         // If value is parameterized, it will be checked when build runs.
         if (projectName.indexOf('$') < 0 && new JobResolver(projectName).job == null)
             projectName = ""; // Ignore/clear bad value to avoid ugly 500 page
         this.projectName = projectName;
-        this.selector = selector;
+        if (buildSelector == null) {
+            buildSelector = DEFAULT_BUILD_SELECTOR;
+        }
+        this.selector = buildSelector;
         this.filter = Util.fixNull(filter).trim();
         this.target = Util.fixNull(target).trim();
         this.flatten = flatten ? Boolean.TRUE : null;
diff --git a/src/main/resources/hudson/plugins/s3/S3CopyArtifact.stapler b/src/main/resources/hudson/plugins/s3/S3CopyArtifact.stapler
deleted file mode 100644
index c8231330..00000000
--- a/src/main/resources/hudson/plugins/s3/S3CopyArtifact.stapler
+++ /dev/null
@@ -1,2 +0,0 @@
-#Thu Jan 12 13:32:19 PST 2012
-constructor=projectName,selector,filter,target,flatten,optional
diff --git a/src/main/resources/hudson/plugins/s3/S3CopyArtifact/config.jelly b/src/main/resources/hudson/plugins/s3/S3CopyArtifact/config.jelly
index c84ae284..1d0b766b 100644
--- a/src/main/resources/hudson/plugins/s3/S3CopyArtifact/config.jelly
+++ b/src/main/resources/hudson/plugins/s3/S3CopyArtifact/config.jelly
@@ -1,10 +1,10 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:ca="/hudson/plugins/copyartifact">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
   <f:entry title="Project name" field="projectName">
     <f:editableComboBox items="${app.topLevelItemNames}" clazz="setting-input"/>
   </f:entry>
-  <ca:selectorList currentSelector="${instance.buildSelector}"
-      name="selector" title="Which build"/>
+  <f:dropdownDescriptorSelector field="buildSelector" help="/plugin/copyartifact/help-buildSelector.html"
+      name="buildSelector" title="Which build" descriptors="${descriptor.availableBuildSelectorList}" />
   <f:entry title="Artifacts to copy" field="filter">
     <f:textbox/>
   </f:entry>
diff --git a/src/main/resources/hudson/plugins/s3/selectorList.jelly b/src/main/resources/hudson/plugins/s3/selectorList.jelly
deleted file mode 100644
index f3019b97..00000000
--- a/src/main/resources/hudson/plugins/s3/selectorList.jelly
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2010, Sun Microsystems, Inc., Alan Harder
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:f="/lib/form">
-  <st:documentation>
-    Generates a dropdown list with the available BuildSelectors.
-    <st:attribute name="currentSelector" use="required">
-      BuildSelector that is currently configured; form is populated showing this object.
-    </st:attribute>
-    <st:attribute name="name" use="required">
-      Name for the form element.
-    </st:attribute>
-    <st:attribute name="title" use="required">
-      Title for the form section.
-    </st:attribute>
-    <st:attribute name="description">
-      Optional description for form section.
-    </st:attribute>
-    <st:attribute name="descriptor">
-      Provide the descriptor that has getBuildSelectors(), if not already in ${descriptor}.
-    </st:attribute>
-    <st:attribute name="omit">
-      Optional name of a selector type to omit from the list.
-    </st:attribute>
-  </st:documentation>
-  <f:dropdownList name="${attrs.name}" title="${attrs.title}" description="${attrs.description}"
-                  help="/plugin/copyartifact/help-buildSelector.html">
-    <j:if test="${dropdownListMode=='generateEntries'}">
-      <d:invokeBody/>
-    </j:if>
-    <j:forEach var="bsDescriptor" items="${descriptor.buildSelectors.iterator()}" varStatus="loop">
-      <j:if test="${bsDescriptor.clazz.simpleName!=attrs.omit}">
-        <j:set var="selector"
-               value="${bsDescriptor==currentSelector.descriptor ? currentSelector : null}"/>
-        <f:dropdownListBlock title="${bsDescriptor.displayName}" value="${loop.index}"
-                             selected="${selector!=null}" staplerClass="${bsDescriptor.clazz.name}">
-          <j:scope>
-            <j:set var="descriptor" value="${bsDescriptor}" />
-            <j:set var="instance" value="${selector}" />
-            <st:include page="config.jelly" class="${bsDescriptor.clazz}" optional="${true}"/>
-          </j:scope>
-        </f:dropdownListBlock>
-      </j:if>
-    </j:forEach>
-  </f:dropdownList>
-</j:jelly>

From 7c04c98ff02ab3ab1ba2736f9308aac69b006957 Mon Sep 17 00:00:00 2001
From: Jo Shields <jo.shields@xamarin.com>
Date: Thu, 30 Jul 2015 08:55:16 +0100
Subject: [PATCH 2/2] Build against new copyartifact ABI (no ca:selectorList)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 68519d85..fba6dc11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>copyartifact</artifactId>
-            <version>1.21</version>
+            <version>1.35.1</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.main</groupId>