diff --git a/.idea/misc.xml b/.idea/misc.xml index 4c4c1de6..5e439f0d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - + + + + - - + \ No newline at end of file diff --git a/.idea/preferred-vcs.xml b/.idea/preferred-vcs.xml new file mode 100644 index 00000000..848cfc44 --- /dev/null +++ b/.idea/preferred-vcs.xml @@ -0,0 +1,6 @@ + + + + ApexVCS + + \ No newline at end of file diff --git a/aws-maven.iml b/aws-maven.iml index 2e0133fc..e742e151 100644 --- a/aws-maven.iml +++ b/aws-maven.iml @@ -30,6 +30,23 @@ + + + + + + + + + + + + + + + + + + - - + \ No newline at end of file diff --git a/src/main/java/org/springframework/build/aws/maven/Region.java b/src/main/java/org/springframework/build/aws/maven/Region.java index 7ccb20c6..03713dda 100644 --- a/src/main/java/org/springframework/build/aws/maven/Region.java +++ b/src/main/java/org/springframework/build/aws/maven/Region.java @@ -21,6 +21,7 @@ enum Region { US_WEST_OREGON("us-west-2", "s3-us-west-2.amazonaws.com"), // US_WEST_NORTHERN_CALIFORNIA("us-west-1", "s3-us-west-1.amazonaws.com"), // EU("EU", "s3-eu-west-1.amazonaws.com"), // + EU_UK("eu-west-2", "s3-eu-west-2.amazonaws.com"), // EU_IRELAND("eu-west-1", "s3-eu-west-1.amazonaws.com"), // GOV_CLOUD("us-gov-west-1", "us-gov-west-1.amazonaws.com"), // ASIA_PACIFIC_SINGAPORE("ap-southeast-1", "s3-ap-southeast-1.amazonaws.com"), // diff --git a/src/test/java/org/springframework/build/aws/maven/RegionTest.java b/src/test/java/org/springframework/build/aws/maven/RegionTest.java index dc045d01..f5bb382d 100644 --- a/src/test/java/org/springframework/build/aws/maven/RegionTest.java +++ b/src/test/java/org/springframework/build/aws/maven/RegionTest.java @@ -28,6 +28,7 @@ public void test() { assertEndpoint("us-west-2", "s3-us-west-2.amazonaws.com"); assertEndpoint("us-west-1", "s3-us-west-1.amazonaws.com"); assertEndpoint("EU", "s3-eu-west-1.amazonaws.com"); + assertEndpoint("eu-west-2", "s3-eu-west-2.amazonaws.com"); assertEndpoint("ap-southeast-1", "s3-ap-southeast-1.amazonaws.com"); assertEndpoint("ap-southeast-2", "s3-ap-southeast-2.amazonaws.com"); assertEndpoint("ap-northeast-1", "s3-ap-northeast-1.amazonaws.com"); diff --git a/src/test/java/org/springframework/build/aws/maven/SimpleStorageServiceWagonIntegrationTest.java b/src/test/java/org/springframework/build/aws/maven/SimpleStorageServiceWagonIntegrationTest.java index 9ec8e6e2..edc103a2 100644 --- a/src/test/java/org/springframework/build/aws/maven/SimpleStorageServiceWagonIntegrationTest.java +++ b/src/test/java/org/springframework/build/aws/maven/SimpleStorageServiceWagonIntegrationTest.java @@ -91,6 +91,7 @@ private List getBuckets() { } else { buckets.add("test.aws-maven.ireland"); buckets.add("test.aws-maven.eu"); + buckets.add("test.aws-maven.eu-uk"); buckets.add("test.aws-maven.northern-california"); buckets.add("test.aws-maven.oregon"); buckets.add("test.aws-maven.sao-paulo");