Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prepare Spring Data 3.0 branch.

Browse Source 
Moves to spring-data-commons 3.0.0
Moves of deprecated and now removed AuditHandler constructor.
Set source version to 16 since the AspectJ-Maven-Plugin does not support Java 17 source yet.

Closes #2309
This commit is contained in:
Jens Schauder
2021-09-21 15:09:27 +02:00
parent 0842ff8c56
commit f95aa6c1b8
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<name>Spring Data JPA</name>
<description>Spring Data module for JPA repositories.</description>
@@ -15,10 +15,11 @@
<parent>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<properties>
<source.level>16</source.level><!-- AspectJ maven plugin can't handle 17 yet -->
<dist.key>DATAJPA</dist.key>
@@ -26,7 +27,7 @@
<hibernate>5.6.0.Final</hibernate>
<mysql-connector-java>8.0.23</mysql-connector-java>
<postgresql>42.2.19</postgresql>
<springdata.commons>2.7.0-SNAPSHOT</springdata.commons>
<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
<vavr>0.10.3</vavr>
<hibernate.groupId>org.hibernate</hibernate.groupId>
@@ -274,13 +275,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
<version>${threetenbp}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.vavr</groupId>
<artifactId>vavr</artifactId>

6
src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java
View File

@@ -34,6 +34,7 @@ import org.springframework.data.auditing.config.AuditingConfiguration;
import org.springframework.data.config.ParsingUtils;
import org.springframework.data.jpa.domain.support.AuditingBeanFactoryPostProcessor;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import org.springframework.data.repository.config.PersistentEntitiesFactoryBean;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
@@ -71,8 +72,11 @@ class JpaAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
@Override
protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) {
BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(PersistentEntitiesFactoryBean.class);
definition.addConstructorArgReference(JPA_MAPPING_CONTEXT_BEAN_NAME);
BeanDefinitionBuilder builder = super.getAuditHandlerBeanDefinitionBuilder(configuration);
return builder.addConstructorArgReference(JPA_MAPPING_CONTEXT_BEAN_NAME);
return builder.addConstructorArgValue(definition.getBeanDefinition());
}
/*