Skip to content

Commit 0ccec17

Browse files
schauderchristophstrobl
authored andcommitted
Prepare Spring Data 3.0 branch.
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
1 parent cdaa044 commit 0ccec17

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

pom.xml

+4-10
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.springframework.data</groupId>
88
<artifactId>spring-data-jpa</artifactId>
9-
<version>2.6.0-SNAPSHOT</version>
9+
<version>3.0.0-SNAPSHOT</version>
1010

1111
<name>Spring Data JPA</name>
1212
<description>Spring Data module for JPA repositories.</description>
@@ -15,18 +15,19 @@
1515
<parent>
1616
<groupId>org.springframework.data.build</groupId>
1717
<artifactId>spring-data-parent</artifactId>
18-
<version>2.6.0-SNAPSHOT</version>
18+
<version>3.0.0-SNAPSHOT</version>
1919
</parent>
2020

2121
<properties>
22+
<source.level>16</source.level><!-- AspectJ maven plugin can't handle 17 yet -->
2223

2324
<dist.key>DATAJPA</dist.key>
2425

2526
<eclipselink>2.7.9</eclipselink>
2627
<hibernate>5.6.0.Final</hibernate>
2728
<mysql-connector-java>8.0.23</mysql-connector-java>
2829
<postgresql>42.2.19</postgresql>
29-
<springdata.commons>2.6.0-SNAPSHOT</springdata.commons>
30+
<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
3031
<vavr>0.10.3</vavr>
3132

3233
<hibernate.groupId>org.hibernate</hibernate.groupId>
@@ -274,13 +275,6 @@
274275
<scope>test</scope>
275276
</dependency>
276277

277-
<dependency>
278-
<groupId>org.threeten</groupId>
279-
<artifactId>threetenbp</artifactId>
280-
<version>${threetenbp}</version>
281-
<optional>true</optional>
282-
</dependency>
283-
284278
<dependency>
285279
<groupId>io.vavr</groupId>
286280
<artifactId>vavr</artifactId>

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.springframework.data.config.ParsingUtils;
3535
import org.springframework.data.jpa.domain.support.AuditingBeanFactoryPostProcessor;
3636
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
37+
import org.springframework.data.repository.config.PersistentEntitiesFactoryBean;
3738
import org.springframework.util.Assert;
3839
import org.springframework.util.ClassUtils;
3940

@@ -71,8 +72,11 @@ protected String getAuditingHandlerBeanName() {
7172
@Override
7273
protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) {
7374

75+
BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(PersistentEntitiesFactoryBean.class);
76+
definition.addConstructorArgReference(JPA_MAPPING_CONTEXT_BEAN_NAME);
77+
7478
BeanDefinitionBuilder builder = super.getAuditHandlerBeanDefinitionBuilder(configuration);
75-
return builder.addConstructorArgReference(JPA_MAPPING_CONTEXT_BEAN_NAME);
79+
return builder.addConstructorArgValue(definition.getBeanDefinition());
7680
}
7781

7882
/*

0 commit comments

Comments
 (0)