Move to common-fileupload 1.5

- Update common-fileupload dependency to 1.5
- Newer commons-fileupload also pulls in newer commons-io which now has two
  toString methods which would both match when the second parameter is null.
  We can choose either since in both cases null is the platform default so cast
  to String.
- bump version to 0.2.4

README.md

@@ -27,7 +27,7 @@ It runs as a tomcat servlet inside the same tomcat container as the Master Porta
         git clone https://github.com/rcauth-eu/aarc-ssh-portal
         cd aarc-ssh-portal
 
-        git checkout v0.2.3
+        git checkout v0.2.4
         cd ssh-portal
 
 3. Build the ssh-portal's war file

RELEASE-NOTES.md

@@ -1,6 +1,6 @@
 # RELEASE NOTES
 
-## Version 0.2.0, 0.2.1 & 0.2.2 & 0.2.3
+## Version 0.2.0-0.2.4
 
 If you are upgrading from a previous release, you will need to make several
 changes:

ssh-portal/pom.xml

@@ -27,7 +27,7 @@
     </developers>
 
     <properties>
-        <revision>0.2.3-SNAPSHOT</revision>
+        <revision>0.2.4-SNAPSHOT</revision>
         <oa4mpVersion>4.2-RCauth-SNAPSHOT</oa4mpVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.3.3</version>
+            <version>1.5</version>
         </dependency>
 
         <dependency>

ssh-portal/src/main/java/eu/rcauth/sshportal/servlet/SSHKeyMainServlet.java

@@ -500,7 +500,7 @@ private Map<String,String> getPostParams(HttpServletRequest request,
                 FileItemStream item = iter.next();
                 String name = item.getFieldName();
                 InputStream stream = item.openStream();
-                String value = IOUtils.toString(stream, null);
+                String value = IOUtils.toString(stream, (String)null);
                 // Can use same IOUtils.toString() on both type, either
                 // formfield or not. Just check for non-valid filename fields
                 if (value != null)  {