diff --git a/README.md b/README.md index 5b274052..144dbc65 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,7 @@ Finally the `~/.m2/settings.xml` must be updated to include access and secret ke Alternatively, the access and secret keys for the account can be provided using * `AWS_ACCESS_KEY_ID` (or `AWS_ACCESS_KEY`) and `AWS_SECRET_KEY` (or `AWS_SECRET_ACCESS_KEY`) [environment variables][env-var] +* `AWS_PROFILE` [environment variable][profile-provider] * `aws.accessKeyId` and `aws.secretKey` [system properties][sys-prop] * The Amazon EC2 [Instance Metadata Service][instance-metadata] @@ -167,6 +168,7 @@ aws s3api put-bucket-policy --bucket $BUCKET --policy "$POLICY" [cli]: http://aws.amazon.com/documentation/cli/ [console]: https://console.aws.amazon.com/s3 [env-var]: http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/EnvironmentVariableCredentialsProvider.html +[profile-provider]: http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/profile/ProfileCredentialsProvider.html [instance-metadata]: http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/InstanceProfileCredentialsProvider.html [policy-generator]: http://awspolicygen.s3.amazonaws.com/policygen.html [s3]: http://aws.amazon.com/s3/ diff --git a/pom.xml b/pom.xml index ce78b0f0..a77cfbc4 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ Standard Maven wagon support for s3:// urls - 1.7.1 + 1.9.33 4.11 1.1.1 1.9.5 diff --git a/src/main/java/org/springframework/build/aws/maven/AuthenticationInfoAWSCredentialsProviderChain.java b/src/main/java/org/springframework/build/aws/maven/AuthenticationInfoAWSCredentialsProviderChain.java index 86726039..9019586a 100644 --- a/src/main/java/org/springframework/build/aws/maven/AuthenticationInfoAWSCredentialsProviderChain.java +++ b/src/main/java/org/springframework/build/aws/maven/AuthenticationInfoAWSCredentialsProviderChain.java @@ -20,6 +20,8 @@ import com.amazonaws.auth.EnvironmentVariableCredentialsProvider; import com.amazonaws.auth.InstanceProfileCredentialsProvider; import com.amazonaws.auth.SystemPropertiesCredentialsProvider; +import com.amazonaws.auth.profile.ProfileCredentialsProvider; + import org.apache.maven.wagon.authentication.AuthenticationInfo; final class AuthenticationInfoAWSCredentialsProviderChain extends AWSCredentialsProviderChain { @@ -27,6 +29,7 @@ final class AuthenticationInfoAWSCredentialsProviderChain extends AWSCredentials AuthenticationInfoAWSCredentialsProviderChain(AuthenticationInfo authenticationInfo) { super(new EnvironmentVariableCredentialsProvider(), new SystemPropertiesCredentialsProvider(), + new ProfileCredentialsProvider(), new InstanceProfileCredentialsProvider(), new AuthenticationInfoAWSCredentialsProvider(authenticationInfo)); }