Skip to content
This repository was archived by the owner on Feb 22, 2019. It is now read-only.

Java 9\10 Support. Reduce dependencies. Update aws-sdk #7

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Java 9\10 Support. Reduce dependencies. Update aws-sdk #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1874009
Allow to use aws-maven with java 9 and 10
May 3, 2018
445ce81
Update aws-sdk version to 321
May 3, 2018
eda86b1
Bump version
May 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<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>

<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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/github/platform/team/plugin/AmazonS3Wagon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down