Merge pull request #8 from SalusaSecondus/master

Fix the build
aws · Dec 16, 2015 · 26ee38b · 26ee38b
2 parents 77a8792 + eb388dd
commit 26ee38b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk</artifactId>
-      <version>1.9.13</version>
+      <version>1.10.41</version>
     </dependency>
 
     <dependency>
@@ -53,7 +53,23 @@
       <version>1.50</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>com.amazonaws</groupId>
+      <artifactId>DynamoDBLocal</artifactId>
+      <version>1.10.5.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
+
+  <!--Custom repository:-->
+  <repositories>
+    <repository>
+      <id>dynamodb-local</id>
+      <name>DynamoDB Local Release Repository</name>
+      <url>http://dynamodb-local.s3-website-us-west-2.amazonaws.com/release</url>
+    </repository>
+  </repositories>
 
   <build>
     <plugins>

diff --git a/...zonaws/services/dynamodbv2/datamodeling/encryption/providers/MostRecentProviderTests.java b/...zonaws/services/dynamodbv2/datamodeling/encryption/providers/MostRecentProviderTests.java
@@ -30,7 +30,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.amazonaws.services.dynamodb.mock.AmazonDynamoDBMock;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.datamodeling.encryption.DynamoDBEncryptor;
 import com.amazonaws.services.dynamodbv2.datamodeling.encryption.EncryptionContext;
@@ -41,6 +40,7 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.encryption.providers.SymmetricStaticProvider;
 import com.amazonaws.services.dynamodbv2.datamodeling.encryption.providers.store.MetaStore;
 import com.amazonaws.services.dynamodbv2.datamodeling.encryption.providers.store.ProviderStore;
+import com.amazonaws.services.dynamodbv2.local.embedded.DynamoDBEmbedded;
 import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
 
 public class MostRecentProviderTests {
@@ -61,7 +61,7 @@ public class MostRecentProviderTests {
     @Before
     public void setup() {
         methodCalls = new HashMap<String, Integer>();
-        client = instrument(new AmazonDynamoDBMock(), AmazonDynamoDB.class, methodCalls);
+        client = instrument(DynamoDBEmbedded.create(), AmazonDynamoDB.class, methodCalls);
         MetaStore.createTable(client, TABLE_NAME, new ProvisionedThroughput(1L, 1L));
         store = new MetaStore(client, TABLE_NAME, ENCRYPTOR);
         ctx = new EncryptionContext.Builder().build();

diff --git a/...amazonaws/services/dynamodbv2/datamodeling/encryption/providers/store/MetaStoreTests.java b/...amazonaws/services/dynamodbv2/datamodeling/encryption/providers/store/MetaStoreTests.java
@@ -27,7 +27,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.amazonaws.services.dynamodb.mock.AmazonDynamoDBMock;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException;
 import com.amazonaws.services.dynamodbv2.datamodeling.encryption.DynamoDBEncryptor;
@@ -38,6 +37,7 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.encryption.providers.SymmetricStaticProvider;
 import com.amazonaws.services.dynamodbv2.datamodeling.encryption.providers.store.MetaStore;
 import com.amazonaws.services.dynamodbv2.datamodeling.encryption.providers.store.ProviderStore;
+import com.amazonaws.services.dynamodbv2.local.embedded.DynamoDBEmbedded;
 import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
 
 public class MetaStoreTests {
@@ -56,7 +56,7 @@ public class MetaStoreTests {
 
     @Before
     public void setup() {
-        client = synchronize(new AmazonDynamoDBMock(), AmazonDynamoDB.class);
+        client = synchronize(DynamoDBEmbedded.create(), AmazonDynamoDB.class);
         MetaStore.createTable(client, TABLE_NAME, new ProvisionedThroughput(1L, 1L));
         store = new MetaStore(client, TABLE_NAME, ENCRYPTOR);
         ctx = new EncryptionContext.Builder().build();