diff --git a/README.md b/README.md
index d2c13cef..bd92c6c0 100644
--- a/README.md
+++ b/README.md
@@ -167,7 +167,7 @@ API changes will follow SEMVER and loosly the Spring Framework releases.
| 5.0.x | >= 2.0 && < 2.1 | >= 5.0 && < 5.1 | Kay-SR1 |
| 5.1.x | == 2.1 | >= 5.1 | Lovelace-SR1 |
| 5.2.x | >= 2.2 | >= 5.2 | Moore-RELEASE, Nuemann-RELASE |
-
+| 6.0.x | >= 3.0 | >= 6.0 | 2023.0.5 |
`spring-data-dynamodb` depends directly on `spring-data` as also `spring-context`, `spring-data` and `spring-tx`.
diff --git a/pom.xml b/pom.xml
index 216efa84..6b67975e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
4.0.0
io.github.boostchicken
spring-data-dynamodb
- 5.2.6-SNAPSHOT
+ 6.0.0-SNAPSHOT
Spring Data DynamoDB
2018
@@ -37,23 +37,22 @@
- 5.3.15
- 2.4.15
+ 6.0.13
+ 3.1.5
- 6.2.2.Final
- 1.12.150
+ 1.12.583
4.13.2
- 2.23.0
- 2.0
+ 5.7.0
+ 4.0.1
1.2.0
1.0.392
3.0.5
UTF-8
UTF-8
- 1.8
- 1.8
- 2.6.3
+ 17
+ 17
+ 3.1.5
@@ -71,19 +70,12 @@
${spring-data.version}
-
- org.hibernate.validator
- hibernate-validator
- ${hibernate-validator.version}
-
-
junit
junit
${junit.version}
-
org.mockito
mockito-core
@@ -102,11 +94,11 @@
DynamoDBLocal
[1.11,2.0)
-
- org.apache.logging.log4j
- log4j-to-slf4j
- 2.17.1
-
+
+ org.apache.logging.log4j
+ log4j-to-slf4j
+ 2.17.1
+
uk.org.lidalia
@@ -145,11 +137,11 @@
org.springframework
spring-tx
-
- org.springframework.boot
- spring-boot-starter-validation
+
+ org.springframework.boot
+ spring-boot-starter-validation
${spring-boot-starter-validation.version}
-
+
org.springframework.data
@@ -157,8 +149,10 @@
- org.hibernate.validator
- hibernate-validator
+ jakarta.validation
+ jakarta.validation-api
+ 3.0.2
+ compile
@@ -169,8 +163,8 @@
- javax.enterprise
- cdi-api
+ jakarta.enterprise
+ jakarta.enterprise.cdi-api
${cdi.version}
compile
@@ -186,11 +180,11 @@
DynamoDBLocal
test
-
- org.apache.logging.log4j
- log4j-to-slf4j
- test
-
+
+ org.apache.logging.log4j
+ log4j-to-slf4j
+ test
+
junit
junit
@@ -336,7 +330,7 @@
org.jacoco
jacoco-maven-plugin
- 0.8.5
+ 0.8.11
@@ -396,26 +390,28 @@
src/checkstyle.xml
-
- com.github.spotbugs
- spotbugs-maven-plugin
- 4.0.4
-
- Max
-
- Max
-
- src/spotbugs-exclude.xml
-
-
-
- verify
-
- check
-
-
-
-
+
+ com.github.spotbugs
+ spotbugs-maven-plugin
+ 4.8.1.0
+
+
+ true
+ Max
+
+ Max
+
+ src/spotbugs-exclude.xml
+
+
+
+ verify
+
+ check
+
+
+
+
org.apache.maven.plugins
maven-release-plugin
@@ -648,31 +644,31 @@
true
-
-
- com.github.github
- site-maven-plugin
- 0.12
-
-
-
- site
-
-
- site-deploy
-
-
- github
-
- Building site
-
- ${site.path}
-
- true
-
-
-
-
+
+
+ com.github.github
+ site-maven-plugin
+ 0.12
+
+
+
+ site
+
+
+ site-deploy
+
+
+ github
+
+ Building site
+
+ ${site.path}
+
+ true
+
+
+
+
@@ -692,7 +688,7 @@
0
- derjust
+ derjust
Sebastian J
zeeman@zeeman.de
America/New_York
@@ -739,7 +735,7 @@
Rene Enriquez
enriquezrene
-
+
Ryon Day
https://github.com/ryonday
@@ -763,8 +759,8 @@
- GitHub
- https://github.com/boostchicken/spring-data-dynamodb/issues
+ GitHub
+ https://github.com/boostchicken/spring-data-dynamodb/issues
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java b/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java
index 1b0dff98..9478464f 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java
+++ b/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java
@@ -28,12 +28,14 @@
import org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport;
import org.springframework.data.auditing.config.AuditingConfiguration;
import org.springframework.data.config.ParsingUtils;
+import org.springframework.data.repository.config.PersistentEntitiesFactoryBean;
import org.springframework.util.Assert;
import java.lang.annotation.Annotation;
import static org.socialsignin.spring.data.dynamodb.config.BeanNames.MAPPING_CONTEXT_BEAN_NAME;
import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;
+import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
/**
* {@link org.springframework.context.annotation.ImportBeanDefinitionRegistrar}
@@ -97,8 +99,11 @@ protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingCon
LOGGER.trace("getAuditHandlerBeanDefinitionBuilder");
Assert.notNull(configuration, "AuditingConfiguration must not be null!");
+ BeanDefinitionBuilder persistentEntities = rootBeanDefinition(PersistentEntitiesFactoryBean.class);
+ persistentEntities.addConstructorArgReference(MAPPING_CONTEXT_BEAN_NAME);
+
BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class);
- builder.addConstructorArgReference(MAPPING_CONTEXT_BEAN_NAME);
+ builder.addConstructorArgValue(persistentEntities.getBeanDefinition());
return configureDefaultAuditHandlerAttributes(configuration, builder);
}
@@ -151,4 +156,4 @@ private void defaultDependenciesIfNecessary(BeanDefinitionRegistry registry, Obj
registry.registerBeanDefinition(MAPPING_CONTEXT_BEAN_NAME, definition);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java b/src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java
index 38e08d42..48c38e5a 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java
+++ b/src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java
@@ -57,8 +57,8 @@
/**
* @return Configures a
* {@link org.springframework.data.auditing.DateTimeProvider} bean name
- * that allows customizing the {@link org.joda.time.DateTime} to be used
+ * that allows customizing the {@link java.time.LocalDateTime} to be used
* for setting creation and modification dates.
*/
String dateTimeProviderRef() default "";
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java b/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java
index 2ce6e89e..fc12d410 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java
+++ b/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java
@@ -64,4 +64,4 @@ public Date unmarshall(Class clazz, String obj) throws IllegalArgumentExce
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java b/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java
index b253640f..d68b7443 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java
+++ b/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java
@@ -34,16 +34,16 @@
import org.slf4j.LoggerFactory;
import org.springframework.util.Assert;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validator;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
- * javax.validation dependant entities validator. When it is registered as
+ * jakarta.validation dependant entities validator. When it is registered as
* Spring component its automatically invoked before entities are saved in
* database.
*
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java b/src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java
index 65dddc27..358854d1 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java
+++ b/src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java
@@ -111,4 +111,4 @@
* @return expression value mappings for query
*/
ExpressionAttribute[] expressionMappingValues() default @ExpressionAttribute;
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java b/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java
index 9054d11e..409a6a86 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java
+++ b/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java
@@ -24,11 +24,10 @@
import org.springframework.data.repository.cdi.CdiRepositoryBean;
import org.springframework.util.Assert;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
-import java.util.Optional;
import java.util.Set;
/**
@@ -85,13 +84,11 @@ class DynamoDBRepositoryBean extends CdiRepositoryBean {
/*
* (non-Javadoc)
*
- * @see javax.enterprise.context.spi.Contextual#create(javax.enterprise
+ * @see jakarta.enterprise.context.spi.Contextual#create(jakarta.enterprise
* .context.spi.CreationalContext, Class, Optional