Merge branch 'master' of github.com:jenkinsci/jenkins

core/src/main/java/hudson/model/FileParameterValue.java

@@ -66,6 +66,9 @@ public class FileParameterValue extends ParameterValue {
      */
     private final String originalFileName;
 
+    /**
+     * Overrides the location in the build to place this file. Initially set to {@link #getName()}
+     */
     private String location;
 
     @DataBoundConstructor
@@ -81,6 +84,7 @@ public class FileParameterValue extends ParameterValue {
         super(name);
         this.file = file;
         this.originalFileName = originalFileName;
+        setLocation(name);
     }
 
     // post initialization hook
@@ -129,7 +133,7 @@ public class FileParameterValue extends ParameterValue {
         return new BuildWrapper() {
             @Override
             public Environment setUp(AbstractBuild build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException {
-            	if (!StringUtils.isEmpty(file.getName())) {
+            	if (!StringUtils.isEmpty(location)) {
             	    listener.getLogger().println("Copying file to "+location);
                     FilePath locationFilePath = build.getWorkspace().child(location);
                     locationFilePath.getParent().mkdirs();

plugins/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.30</version>
+    <version>1.31</version>
     <relativePath />
   </parent>
 
@@ -101,13 +101,6 @@
       not to have version number in the .hpi file name.
     -->
     <finalName>${project.artifactId}</finalName>
-    <!--
-      I don't really understand how this works, but it makes Maven recognizes
-      <packaging>hpi</packaging> defined in maven-hpi-plugin.
-
-      <extensions>true</extensions> is apparently needed to have Maven read
-      the plugin's Plexus component file.
-    -->
     <plugins>
       <plugin>
         <groupId>org.jenkins-ci.tools</groupId>