diff --git a/pom.xml b/pom.xml
index 26d02d7..f7811f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
false
true
spotbugs-exclude.xml
+ 1.3.0
false
org.killbill.billing.plugin.notification.api,org.killbill.billing.plugin.notification.generator.*
org.killbill.billing.plugin.notification.*
@@ -91,6 +92,11 @@
+
+ commons-logging
+ commons-logging
+ ${commons-logging.version}
+
io.zonky.test
embedded-postgres
@@ -113,7 +119,6 @@
joda-time
joda-time
- provided
org.apache.commons
diff --git a/src/main/java/org/killbill/billing/plugin/notification/email/EmailSender.java b/src/main/java/org/killbill/billing/plugin/notification/email/EmailSender.java
index 4c4eafc..49d5691 100644
--- a/src/main/java/org/killbill/billing/plugin/notification/email/EmailSender.java
+++ b/src/main/java/org/killbill/billing/plugin/notification/email/EmailSender.java
@@ -69,7 +69,7 @@ public class EmailSender {
private static final String EMAIL_NOTIFICATION_VIA_SES = "org.killbill.email.notification.via.ses";
private static final String AWS_REGION = "org.killbill.aws.region";
- private static final String DEFAULT_AWS_REGION = "us-east-1";
+ private static final String DEFAULT_AWS_REGION = "US_EAST_1";
private final boolean useSmtpAuth;
private final int useSmtpPort;
@@ -216,7 +216,7 @@ private void sendEmailViaSES(final List to, final List cc, final
return;
}
- final Regions region = Regions.valueOf(awsRegion);
+ final Regions region = Regions.valueOf(awsRegion.toUpperCase());
final AmazonSimpleEmailService client = AmazonSimpleEmailServiceClientBuilder.standard()
.withRegion(region)
diff --git a/src/test/java/org/killbill/billing/plugin/notification/email/TestEmailSender.java b/src/test/java/org/killbill/billing/plugin/notification/email/TestEmailSender.java
index 3e30958..1ab0359 100644
--- a/src/test/java/org/killbill/billing/plugin/notification/email/TestEmailSender.java
+++ b/src/test/java/org/killbill/billing/plugin/notification/email/TestEmailSender.java
@@ -35,9 +35,14 @@ public class TestEmailSender {
private static final String TEST_SMTP_PWD = "bar";
private static final String TEST_SMTP_FROM = "caramel@mou.com";
+ private static final String AWS_REGION = "us-east-1";
+
+
@Test(enabled = false)
public void foo() throws IOException, EmailException, EmailNotificationException {
- EmailSender sender = new EmailSender(TEST_SMTP_SERVER_NAME, TEST_SMPT_SERVER_PORT, TEST_SMTP_USER, TEST_SMTP_PWD, TEST_SMTP_FROM, true, false, false);
+ final EmailSender sender = new EmailSender(TEST_SMTP_SERVER_NAME, TEST_SMPT_SERVER_PORT, TEST_SMTP_USER,
+ TEST_SMTP_PWD, TEST_SMTP_FROM, true, false,
+ false, AWS_REGION, false);
final String to = "something_that_works@gmail.com";
sender.sendPlainTextEmail(ImmutableList.of(to), ImmutableList.of(), "coucou", "body", Mockito.mock(SmtpProperties.class));
}