Skip to content

Commit 1fa0759

Browse files
committed
fix: issues derjust#230 and derjust#233 (resolve pom conflicts)
1 parent 2dbf6aa commit 1fa0759

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<spring-data.version>2.1.2.RELEASE</spring-data.version>
4242

4343
<hibernate-validator.version>6.0.9.Final</hibernate-validator.version>
44-
<aws-java-sdk.version>1.11.493</aws-java-sdk.version>
44+
<aws-java-sdk.version>1.11.515</aws-java-sdk.version>
4545
<junit.version>4.12</junit.version>
4646
<mockito.version>2.23.0</mockito.version>
4747
<cdi.version>1.2</cdi.version>

src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@ private void postProcess(BeanDefinitionBuilder builder, String repositoryName, S
139139

140140
builder.addPropertyReference("dynamoDBOperations", dynamoDBOperationsRef);
141141

142-
/*
143-
* Fix issue #233 if (StringUtils.hasText(dynamoDBMapperConfigRef)) {
144-
* builder.addPropertyReference("dynamoDBMapperConfig",
145-
* dynamoDBMapperConfigRef); }
146-
*/
142+
/* Fix issue #233 - these statements were commented on as they are not supposed to be necessary */
143+
// if (StringUtils.hasText(dynamoDBMapperConfigRef)) {
144+
// builder.addPropertyReference("dynamoDBMapperConfig",
145+
// dynamoDBMapperConfigRef);
146+
// }
147147
}
148148

149149
if (!StringUtils.hasText(dynamoDBMappingContextRef)) {

0 commit comments

Comments
 (0)