Skip to content

Fix the build #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 16, 2015
Merged

Fix the build #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...zonaws/services/dynamodbv2/datamodeling/encryption/providers/MostRecentProviderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand All @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions ...amazonaws/services/dynamodbv2/datamodeling/encryption/providers/store/MetaStoreTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand All @@ -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();
Expand Down