Update forked s3-plugin

pom.xml

@@ -8,7 +8,7 @@
 
     <artifactId>s3</artifactId>
     <packaging>hpi</packaging>
-    <version>0.8-SNAPSHOT</version>
+    <version>0.9-SNAPSHOT</version>
     <name>Jenkins S3 publisher plugin</name>
     <url>https://wiki.jenkins-ci.org/display/JENKINS/S3+Plugin</url>
 
@@ -43,13 +43,14 @@
         <connection>scm:git:ssh://github.com/jenkinsci/s3-plugin.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/jenkinsci/s3-plugin.git</developerConnection>
         <url>https://github.com/jenkinsci/s3-plugin</url>
-    </scm>
+      <tag>HEAD</tag>
+  </scm>
 
     <dependencies>
         <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk</artifactId>
-            <version>1.9.6</version>
+          <groupId>org.jenkins-ci.plugins</groupId>
+          <artifactId>aws-java-sdk</artifactId>
+          <version>1.10.16</version>
         </dependency>
         <dependency>
             <groupId>net.java.dev.jna</groupId>

src/main/java/hudson/plugins/s3/Destination.java

@@ -26,20 +26,25 @@ public Destination(final String userBucketName, final String fileName) {
       throw new IllegalArgumentException("Not defined for null parameters: "+userBucketName+","+fileName);
 
     final String[] bucketNameArray = userBucketName.split("/", 2);
+    final String s3CompatibleFileName = replaceWindowsBackslashes(fileName);
 
     bucketName = bucketNameArray[0];
 
     if (bucketNameArray.length > 1) {
-        objectName = bucketNameArray[1] + "/" + fileName;
+        objectName = bucketNameArray[1] + "/" + s3CompatibleFileName;
     } else {
-        objectName = fileName;
+        objectName = s3CompatibleFileName;
     }
   }
 
-@Override
- public String toString() {
-   return "Destination [bucketName="+bucketName+", objectName="+objectName+"]";
- }
+  private String replaceWindowsBackslashes(String fileName) {
+      return fileName.replace("\\", "/");
+  }
+
+  @Override
+  public String toString() {
+    return "Destination [bucketName="+bucketName+", objectName="+objectName+"]";
+  }
 
 
   public static Destination newFromRun(Run run, String bucketName, String fileName)

src/test/java/hudson/plugins/s3/BucketnameTest.java

@@ -27,4 +27,10 @@ public void testAnythingAfterSlashInBucketNameIsPrependedToObjectName() {
 
   }
 
+  @Test
+  public void testWindowsPathsConvertingToS3CompatiblePaths() {
+    assertEquals("Destination [bucketName=my-bucket, objectName=with-some/subfolder//path-from/windows.txt]",
+            new Destination("my-bucket/with-some/subfolder/", "path-from\\windows.txt").toString() );
+  }
+
 }