From 1874009ebb4d7a20a1cd92c18fb310c705a1793e Mon Sep 17 00:00:00 2001
From: Daniil Mikhaylov <dmikhaylov@odin.com>
Date: Fri, 4 May 2018 03:16:04 +0700
Subject: [PATCH 1/3] Allow to use aws-maven with java 9 and 10

---
 pom.xml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a8bd5f22..bef8ffed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk</artifactId>
+            <artifactId>aws-java-sdk-s3</artifactId>
             <version>${amazonaws.version}</version>
             <exclusions>
                 <exclusion>
@@ -99,6 +99,28 @@
             <version>1.3</version>
             <scope>test</scope>
         </dependency>
+
+        <!-- required to bc for java 8 -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>javax.activation-api</artifactId>
+            <version>1.2.0</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -133,7 +155,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.0</version>
+                <version>0.8.1</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>

From 445ce818573edf54587c03ddfc7db8fdd11acdb5 Mon Sep 17 00:00:00 2001
From: Daniil Mikhaylov <dmikhaylov@odin.com>
Date: Fri, 4 May 2018 03:16:57 +0700
Subject: [PATCH 2/3] Update aws-sdk version to 321

---
 pom.xml                                                         | 2 +-
 .../java/com/github/platform/team/plugin/AmazonS3Wagon.java     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bef8ffed..69f6d0b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <description>Standard Maven wagon support for s3:// urls</description>
 
     <properties>
-        <amazonaws.version>1.11.276</amazonaws.version>
+        <amazonaws.version>1.11.321</amazonaws.version>
         <wagon.version>3.0.0</wagon.version>
 
         <slf4j.version>1.7.25</slf4j.version>
diff --git a/src/main/java/com/github/platform/team/plugin/AmazonS3Wagon.java b/src/main/java/com/github/platform/team/plugin/AmazonS3Wagon.java
index 4f9e162a..e5455ee6 100644
--- a/src/main/java/com/github/platform/team/plugin/AmazonS3Wagon.java
+++ b/src/main/java/com/github/platform/team/plugin/AmazonS3Wagon.java
@@ -148,6 +148,7 @@ private static PutObjectRequest createDirectoryPutObjectRequest(String bucketNam
 
     private static String getBucketRegion(AWSCredentialsProvider credentialsProvider, ClientConfiguration clientConfiguration, String bucketName) {
         return AmazonS3Client.builder()
+                .withRegion("us-east-1")
                 .withCredentials(credentialsProvider)
                 .withClientConfiguration(clientConfiguration)
                 .enableForceGlobalBucketAccess()

From eda86b1a7814cef2a4dacb4c4f05ac9ecd096f96 Mon Sep 17 00:00:00 2001
From: Daniil Mikhaylov <dmikhaylov@odin.com>
Date: Fri, 4 May 2018 03:21:02 +0700
Subject: [PATCH 3/3] Bump version

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

diff --git a/pom.xml b/pom.xml
index 69f6d0b1..15b55a3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.github.platform-team</groupId>
     <artifactId>aws-maven</artifactId>
     <packaging>jar</packaging>
-    <version>6.0.0</version>
+    <version>6.1.0</version>
     <name>Amazon Web Services S3 Maven Wagon Support</name>
     <description>Standard Maven wagon support for s3:// urls</description>